Code

merge-recursive: Fix sorting order and directory change assumptions
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:19:56 +0000 (23:19 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:34 +0000 (14:19 -0700)
commitf0fd4d05e8a17fe5ccdd4d3edd686bc6702b8144
treea0f6aa600a85b460c96cd8d6984c1bb857bc3703
parent7b1c610f84a46fa237627b3307707afb520e555c
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>
merge-recursive.c
t/t6020-merge-df.sh