]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'rs/fsck-duplicate-names-in-trees'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:43 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:44 +0000 (14:39 -0700)
"git fsck" ensures that the paths recorded in tree objects are
sorted and without duplicates, but it failed to notice a case where
a blob is followed by entries that sort before a tree with the same
name.  This has been corrected.

* rs/fsck-duplicate-names-in-trees:
  fsck: report non-consecutive duplicate names in trees

1  2 
fsck.c
t/t1450-fsck.sh

diff --cc fsck.c
Simple merge
diff --cc t/t1450-fsck.sh
Simple merge