diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-09 01:06:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-09 01:06:29 (GMT) |
| commit | 7e75aeb290b5f0d858019359fee4e0132637c726 (patch) | |
| tree | e69483b90bf8aed5adcf7c071b303b87657fd1ae /rebase-interactive.h | |
| parent | ce095ecfe49791508860fc180bf67924d62503ba (diff) | |
| parent | fe747043dc96fd5c151496f0e45dbf80de07793d (diff) | |
| download | git-7e75aeb290b5f0d858019359fee4e0132637c726.zip git-7e75aeb290b5f0d858019359fee4e0132637c726.tar.gz git-7e75aeb290b5f0d858019359fee4e0132637c726.tar.bz2 | |
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
Diffstat (limited to 'rebase-interactive.h')
0 files changed, 0 insertions, 0 deletions