From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:46 +0000 (-0700)
Subject: Merge branch 'sg/t0020-conversion-fix'
X-Git-Tag: v2.19.0-rc1~11
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/df19317f4f8d8bf699556d594f79d9a6de83a769?hp=603160b17e1884da3584dc5b424ecea4865c3d52

Merge branch 'sg/t0020-conversion-fix'

Test fixes.

* sg/t0020-conversion-fix:
t0020-crlf: check the right file
---

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 5f056982a5..854da0ae16 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -160,7 +160,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) &&