Filip Navara b83114f140 Fix one performance/correctness regression in #6478 found on Rails repository. (#6686) ...

* 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>

* Perform history simplification. If a file is present on multiple parents
in a merge commit follow only the first parent.

2019-04-21 16:49:06 +08:00

6.5 KiB

Raw Blame History

View Raw