summaryrefslogtreecommitdiff
path: root/Documentation/git-describe.txt
diff options
context:
space:
mode:
authorLibravatar René Scharfe <l.s.r@web.de>2020-05-21 11:52:54 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-21 11:03:13 -0700
commitfe747043dc96fd5c151496f0e45dbf80de07793d (patch)
tree7971e7fb2c7202fad06be3f0fe2d489e4da76834 /Documentation/git-describe.txt
parentt1450: demonstrate undetected in-tree d/f conflict (diff)
downloadtgif-fe747043dc96fd5c151496f0e45dbf80de07793d.tar.xz
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 'Documentation/git-describe.txt')
0 files changed, 0 insertions, 0 deletions