summaryrefslogtreecommitdiff
path: root/pack-check.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2011-08-12 05:19:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-14 21:19:34 (GMT)
commitf0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144 (patch)
treea0f6aa600a85b460c96cd8d6984c1bb857bc3703 /pack-check.c
parent7b1c610f84a46fa237627b3307707afb520e555c (diff)
downloadgit-f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144.zip
git-f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144.tar.gz
git-f0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144.tar.bz2
merge-recursive: Fix sorting order and directory change assumptions
We cannot assume that directory/file conflicts will appear in sorted order; for example, 'letters.txt' comes between 'letters' and 'letters/file'. Thanks to Johannes for a pointer about qsort stability issues with Windows and suggested code change. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pack-check.c')
0 files changed, 0 insertions, 0 deletions