summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-28 12:53:29 -0700
commit8063ff9cf595dc9414e7a27d3310ae1031f5c883 (patch)
tree5a802422eefc4bc4c92e580e953a9ebe785b6030 /t
parentMerge branch 'ab/refspec-init-fix' (diff)
parentconfig.c: fix regression for core.safecrlf false (diff)
downloadtgif-8063ff9cf595dc9414e7a27d3310ae1031f5c883.tar.xz
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-xt/t0020-crlf.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 71350e0657..5f056982a5 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 &&