From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Wed, 22 Aug 2018 12:44:36 +0000 (+0200)
Subject: t0020-crlf: check the right file
X-Git-Tag: v2.19.0-rc1~11^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30612cb67090d34f880f67e4ca73f6a1247f1a95;p=thirdparty%2Fgit.git

t0020-crlf: check the right file

In the test 'checkout with autocrlf=input' in 't0020-crlf.sh', one of
the 'has_cr' checks looks at the non-existing file 'two' instead of
'dir/two'.  The test still succeeds, without actually checking what it
was supposed to, because this check is expected to fail anyway.

As a minimal fix, fix the name of the file to be checked.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 144fdcde7b..f7a6a3ce7d 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -148,7 +148,7 @@ test_expect_success 'checkout with autocrlf=input' '
 	git config core.autocrlf input &&
 	git read-tree --reset -u HEAD &&
 	test_must_fail has_cr one &&
-	test_must_fail has_cr two &&
+	test_must_fail has_cr dir/two &&
 	git update-index -- one dir/two &&
 	test "$one" = $(git hash-object --stdin <one) &&
 	test "$two" = $(git hash-object --stdin <dir/two) &&