path: root/compat/mingw.c
diff options
authorJohannes Schindelin <>2019-09-30 17:21:54 (GMT)
committerJunio C Hamano <>2019-10-02 05:44:51 (GMT)
commit97fff6101220b66bc293239ab2cf29fc3624072b (patch)
tree8c0c9a1415c4160b8d0f798d79e539d984d7c501 /compat/mingw.c
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff)
Move git_sort(), a stable sort, into into libgit.a
The `qsort()` function is not guaranteed to be stable, i.e. it does not promise to maintain the order of items it is told to consider equal. In contrast, the `git_sort()` function we carry in `compat/qsort.c` _is_ stable, by virtue of implementing a merge sort algorithm. In preparation for using a stable sort in Git's rename detection, move the stable sort into `libgit.a` so that it is compiled in unconditionally, and rename it to `git_stable_qsort()`. Note: this also makes the hack obsolete that was introduced in fe21c6b285d (mingw: reencode environment variables on the fly (UTF-16 <-> UTF-8), 2018-10-30), where we included `compat/qsort.c` directly in `compat/mingw.c` to use the stable sort. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'compat/mingw.c')
1 files changed, 3 insertions, 8 deletions
diff --git a/compat/mingw.c b/compat/mingw.c
index 738f0a8..50af33b 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1229,11 +1229,6 @@ static int wenvcmp(const void *a, const void *b)
return _wcsnicmp(p, q, p_len);
-/* We need a stable sort to convert the environment between UTF-16 <-> UTF-8 */
-#include "qsort.c"
* Build an environment block combining the inherited environment
* merged with the given list of settings.
@@ -1272,8 +1267,8 @@ static wchar_t *make_environment_block(char **deltaenv)
* If there is a deltaenv, let's accumulate all keys into `array`,
- * sort them using the stable git_qsort() and then copy, skipping
- * duplicate keys
+ * sort them using the stable git_stable_qsort() and then copy,
+ * skipping duplicate keys
for (p = wenv; p && *p; ) {
ALLOC_GROW(array, nr + 1, alloc);
@@ -1296,7 +1291,7 @@ static wchar_t *make_environment_block(char **deltaenv)
p += wlen + 1;
- git_qsort(array, nr, sizeof(*array), wenvcmp);
+ git_stable_qsort(array, nr, sizeof(*array), wenvcmp);
ALLOC_ARRAY(result, size + delta_size);
for (p = result, i = 0; i < nr; i++) {