summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-10-09 14:00:59 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-09 14:00:59 +0900
commit772cad0afb834b9af8ee56511dc3df4d6e2f011d (patch)
treebf4f9f9be0c01cfb4b4adb41dfda0ccb3fc1ba99 /Makefile
parentMerge branch 'js/mingw-spawn-with-spaces-in-path' (diff)
parentdiffcore_rename(): use a stable sort (diff)
downloadtgif-772cad0afb834b9af8ee56511dc3df4d6e2f011d.tar.xz
Merge branch 'js/diff-rename-force-stable-sort'
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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d644527d37..c99361e719 100644
--- a/Makefile
+++ b/Makefile
@@ -986,6 +986,7 @@ LIB_OBJS += shallow.o
LIB_OBJS += sideband.o
LIB_OBJS += sigchain.o
LIB_OBJS += split-index.o
+LIB_OBJS += stable-qsort.o
LIB_OBJS += strbuf.o
LIB_OBJS += streaming.o
LIB_OBJS += string-list.o
@@ -1731,7 +1732,6 @@ ifdef NO_GETPAGESIZE
endif
ifdef INTERNAL_QSORT
COMPAT_CFLAGS += -DINTERNAL_QSORT
- COMPAT_OBJS += compat/qsort.o
endif
ifdef HAVE_ISO_QSORT_S
COMPAT_CFLAGS += -DHAVE_ISO_QSORT_S