projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ce095ec fe74704)
Merge branch 'rs/fsck-duplicate-names-in-trees'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Jun 2020 01:06:28 +0000 (18:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Jun 2020 01:06:29 +0000 (18:06 -0700)
commit7e75aeb290b5f0d858019359fee4e0132637c726
treee69483b90bf8aed5adcf7c071b303b87657fd1aetree | snapshot
parentce095ecfe49791508860fc180bf67924d62503bacommit | diff
parentfe747043dc96fd5c151496f0e45dbf80de07793dcommit | diff
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
fsck.c diff1 | diff2 | blob | history
t/t1450-fsck.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.