diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-28 00:33:47 +0300 |
| commit | df19317f4f8d8bf699556d594f79d9a6de83a769 (patch) | |
| tree | 15a26a658d8422264c1373de94c4fd81df36e9fc /t/t0020-crlf.sh | |
| parent | 603160b17e1884da3584dc5b424ecea4865c3d52 (diff) | |
| parent | 30612cb67090d34f880f67e4ca73f6a1247f1a95 (diff) | |
Merge branch 'sg/t0020-conversion-fix'
Test fixes.
* sg/t0020-conversion-fix:
t0020-crlf: check the right file
Diffstat (limited to 't/t0020-crlf.sh')
| -rwxr-xr-x | t/t0020-crlf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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) && |