diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 14:35:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-25 13:55:03 -0700 |
| commit | 5430bb283b478991a979437a79e10dcbb6f20e28 (patch) | |
| tree | 4f9a2a82ee0ffc5080b3fd5e1502adc1440f3d36 /t | |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
| download | git-5430bb283b478991a979437a79e10dcbb6f20e28.tar.gz git-5430bb283b478991a979437a79e10dcbb6f20e28.tar.xz | |
diff: demote core.safecrlf=true to core.safecrlf=warn
Otherwise the user will not be able to start to guess where in the
contents in the working tree the offending unsafe CR lies.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0020-crlf.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 1a8f44c44..e526184a0 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -81,6 +81,14 @@ test_expect_success 'safecrlf: print warning only once' ' test $(git add doublewarn 2>&1 | grep "CRLF will be replaced by LF" | wc -l) = 1 ' + +test_expect_success 'safecrlf: git diff demotes safecrlf=true to warn' ' + git config core.autocrlf input && + git config core.safecrlf true && + git diff HEAD +' + + test_expect_success 'switch off autocrlf, safecrlf, reset HEAD' ' git config core.autocrlf false && git config core.safecrlf false && |