Browse Source

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>
maint
SZEDER Gábor 6 years ago committed by Junio C Hamano
parent
commit
30612cb670
  1. 2
      t/t0020-crlf.sh

2
t/t0020-crlf.sh

@ -148,7 +148,7 @@ test_expect_success 'checkout with autocrlf=input' '
git config core.autocrlf input && git config core.autocrlf input &&
git read-tree --reset -u HEAD && git read-tree --reset -u HEAD &&
test_must_fail has_cr one && 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 && git update-index -- one dir/two &&
test "$one" = $(git hash-object --stdin <one) && test "$one" = $(git hash-object --stdin <one) &&
test "$two" = $(git hash-object --stdin <dir/two) && test "$two" = $(git hash-object --stdin <dir/two) &&

Loading…
Cancel
Save