From: René Scharfe <l.s.r@web.de>
Date: Thu, 21 May 2020 09:52:43 +0000 (+0200)
Subject: t1450: demonstrate undetected in-tree d/f conflict
X-Git-Tag: v2.28.0-rc0~70^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d71b1cf6031e5dc4381a067fba16167d14f567a;p=thirdparty%2Fgit.git

t1450: demonstrate undetected in-tree d/f conflict

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index a006ef1ee1..7e70a253f8 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -261,6 +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/
 
 test_expect_success 'unparseable tree object' '
 	test_oid_cache <<-\EOF &&