Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix one performance/correctness regression in #6478 found on Rails repository. #6686

Merged
merged 5 commits into from
Apr 21, 2019
Merged

Fix one performance/correctness regression in #6478 found on Rails repository. #6686

merged 5 commits into from
Apr 21, 2019

Commits on Apr 19, 2019

  1. Fix flaw in the commit history lookup that caused unnecessary traversal 

    when the repository contains a lot of merge commits.

Also return the merge commit as the changed one if the file or
directory was changed as part of the merge, eg. through conflict
resolution.

Signed-off-by: Filip Navara <filip.navara@gmail.com>
    @filipnavara
    filipnavara committed Apr 19, 2019
    Configuration menu
    Copy the full SHA
    158506f View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2019

  1. Perform history simplification. If a file is present on multiple parents 

    in a merge commit follow only the first parent.
    @filipnavara
    filipnavara committed Apr 20, 2019
    Configuration menu
    Copy the full SHA
    3de22e5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into commit_info_fix

    @zeripath
    zeripath authored Apr 20, 2019
    Configuration menu
    Copy the full SHA
    48c2421 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into commit_info_fix

    @lafriks
    lafriks authored Apr 20, 2019
    Configuration menu
    Copy the full SHA
    704ae53 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2019

  1. Merge branch 'master' into commit_info_fix

    @lunny
    lunny authored Apr 21, 2019
    Configuration menu
    Copy the full SHA
    e458a4f View commit details
    Browse the repository at this point in the history