1
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-02-02 15:09:33 -05:00
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
..
2019-04-02 08:48:31 +01:00
2018-01-31 00:09:16 +02:00
2019-04-02 08:48:31 +01:00
2019-04-07 03:25:14 +03:00
2018-11-04 22:20:00 -05:00
2019-04-02 08:48:31 +01:00
2017-11-13 22:51:45 +08:00
2018-03-16 22:04:33 +08:00
2019-03-08 11:42:50 -05:00
2019-04-02 08:48:31 +01:00
2019-04-02 08:48:31 +01:00
2019-04-02 08:48:31 +01:00