]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/diff-rename-force-stable-sort'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Oct 2019 05:00:59 +0000 (14:00 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Oct 2019 05:00:59 +0000 (14:00 +0900)
The rename detection logic sorts a list of rename source candidates
by similarity to pick the best candidate, which means that a tie
between sources with the same similarity is broken by the original
location in the original candidate list (which is sorted by path).
Force the sorting by similarity done with a stable sort, which is
not promised by system supplied qsort(3), to ensure consistent
results across platforms.

* js/diff-rename-force-stable-sort:
  diffcore_rename(): use a stable sort
  Move git_sort(), a stable sort, into into libgit.a

1  2 
Makefile
compat/mingw.c
git-compat-util.h

diff --cc Makefile
Simple merge
diff --cc compat/mingw.c
Simple merge
Simple merge