diff options
| author | René Scharfe <l.s.r@web.de> | 2020-05-21 09:52:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-21 18:03:13 (GMT) |
| commit | fe747043dc96fd5c151496f0e45dbf80de07793d (patch) | |
| tree | 7971e7fb2c7202fad06be3f0fe2d489e4da76834 /t | |
| parent | 3d71b1cf6031e5dc4381a067fba16167d14f567a (diff) | |
| download | git-fe747043dc96fd5c151496f0e45dbf80de07793d.zip git-fe747043dc96fd5c151496f0e45dbf80de07793d.tar.gz git-fe747043dc96fd5c151496f0e45dbf80de07793d.tar.bz2 | |
fsck: detect more in-tree d/f conflicts
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1450-fsck.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index 7e70a25..6555a62 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -261,7 +261,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 && |