diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-09 04:06:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-09 04:06:29 +0300 |
| commit | 7e75aeb290b5f0d858019359fee4e0132637c726 (patch) | |
| tree | e69483b90bf8aed5adcf7c071b303b87657fd1ae /fsck.c | |
| parent | ce095ecfe49791508860fc180bf67924d62503ba (diff) | |
| parent | fe747043dc96fd5c151496f0e45dbf80de07793d (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
Diffstat (limited to 'fsck.c')
| -rw-r--r-- | fsck.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -598,7 +598,7 @@ static int verify_ordered(unsigned mode1, const char *name1, /* * There can be non-consecutive duplicates due to the implicitly - * add slash, e.g.: + * added slash, e.g.: * * foo * foo.bar @@ -620,7 +620,7 @@ static int verify_ordered(unsigned mode1, const char *name1, if (!f_name) break; if (!skip_prefix(name2, f_name, &p)) - break; + continue; if (!*p) return TREE_HAS_DUPS; if (is_less_than_slash(*p)) { |