[PATCH 4/4] fsck: detect more in-tree d/f conflicts
- From
René Scharfe <l.s.r@web.de>
- Date
- May 21, 2020, 09:52 UTC
- Message-ID
- <36ba44ed-d076-12fb-3d28-7b5989c736b7@web.de>
- In-Reply-To
- <xmqq4ksmsaks.fsf@gitster.c.googlers.com>
If the conflict candidate file name from the top of the stack is not a prefix of the current candiate directory then we can discard it as no matching directory can come up later. But we are not done checking the candidate directory -- the stack might still hold a matching file name, so stay in the loop and check the next candidate file name.
Signed-off-by: René Scharfe <l.s.r@web.de> --- fsck.c | 2 +- t/t1450-fsck.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fsck.c b/fsck.c index b48426262c..f82e2fe9e3 100644 --- a/fsck.c +++ b/fsck.c @@ -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)) { diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 5780e10cbc..344a2aad82 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -284,7 +284,7 @@ check_duplicate_names () { check_duplicate_names success x x.1 x/ check_duplicate_names success x x.1.2 x.1/ x/ -check_duplicate_names failure x x.1 x.1.2 x/ +check_duplicate_names success x x.1 x.1.2 x/ test_expect_success 'unparseable tree object' ' test_oid_cache <<-\EOF && -- 2.26.2