diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-28 19:53:29 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 19:53:29 (GMT) |
| commit | 8063ff9cf595dc9414e7a27d3310ae1031f5c883 (patch) | |
| tree | 5a802422eefc4bc4c92e580e953a9ebe785b6030 /t | |
| parent | a9097269036141876c586ddeee561a37b686c8e5 (diff) | |
| parent | 6cb09125bea69d9bdb461b8ecacd5c50c9e6a4f5 (diff) | |
| download | git-8063ff9cf595dc9414e7a27d3310ae1031f5c883.zip git-8063ff9cf595dc9414e7a27d3310ae1031f5c883.tar.gz git-8063ff9cf595dc9414e7a27d3310ae1031f5c883.tar.bz2 | |
Merge branch 'as/safecrlf-quiet-fix'
Fix for 2.17-era regression around `core.safecrlf`.
* as/safecrlf-quiet-fix:
config.c: fix regression for core.safecrlf false
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0020-crlf.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 71350e0..5f05698 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -98,6 +98,16 @@ test_expect_success 'safecrlf: git diff demotes safecrlf=true to warn' ' ' +test_expect_success 'safecrlf: no warning with safecrlf=false' ' + git config core.autocrlf input && + git config core.safecrlf false && + + for w in I am all CRLF; do echo $w; done | append_cr >allcrlf && + git add allcrlf 2>err && + test_must_be_empty err +' + + test_expect_success 'switch off autocrlf, safecrlf, reset HEAD' ' git config core.autocrlf false && git config core.safecrlf false && |