diff options
| author | Filip Navara <filip.navara@gmail.com> | 2019-04-21 10:49:06 +0200 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2019-04-21 16:49:06 +0800 |
| commit | b83114f1407247415b184f77f8f2f6ecea8cb994 (patch) | |
| tree | 668d67f6cf3ae187f70ded4d450883767f44bc8d /routers/api/v1/api.go | |
| parent | 04ff3dd51048e2733a6127c6b75f9bb45a7e8575 (diff) | |
| download | gitea-b83114f1407247415b184f77f8f2f6ecea8cb994.tar.gz gitea-b83114f1407247415b184f77f8f2f6ecea8cb994.zip | |
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.
Diffstat (limited to 'routers/api/v1/api.go')
0 files changed, 0 insertions, 0 deletions