summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar SZEDER Gábor <szeder.dev@gmail.com>2018-08-22 14:44:36 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-22 09:08:08 -0700
commit30612cb67090d34f880f67e4ca73f6a1247f1a95 (patch)
tree7e6b86e05c2c1f93dd2c048910cec3c2dfe80f4b
parentt0020: fix ignored exit code inside loops (diff)
downloadtgif-30612cb67090d34f880f67e4ca73f6a1247f1a95.tar.xz
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>
-rwxr-xr-xt/t0020-crlf.sh2
1 files changed, 1 insertions, 1 deletions
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) &&