From: Junio C Hamano Date: Tue, 9 Jun 2020 01:06:28 +0000 (-0700) Subject: Merge branch 'rs/fsck-duplicate-names-in-trees' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7e75aeb290b5f0d858019359fee4e0132637c726;p=git.git Merge branch 'rs/fsck-duplicate-names-in-trees' The check in "git fsck" to ensure that the tree objects are sorted still had corner cases it missed unsorted entries. * rs/fsck-duplicate-names-in-trees: fsck: detect more in-tree d/f conflicts t1450: demonstrate undetected in-tree d/f conflict t1450: increase test coverage of in-tree d/f detection fsck: fix a typo in a comment --- 7e75aeb290b5f0d858019359fee4e0132637c726