X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft0020-crlf.sh;h=cf84f0a1ab5b392930f1d5a0008530399a6a00f6;hb=e4aee10a2eaf0937d86d046f85ee569a75cae9ac;hp=723b29ad17f778f9f9a96682dee1793191b88667;hpb=31930b5beece8ff86f823b62cf0937e73e9494fa;p=git.git diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh index 723b29ad1..cf84f0a1a 100755 --- a/t/t0020-crlf.sh +++ b/t/t0020-crlf.sh @@ -214,4 +214,28 @@ test_expect_success 'apply patch --index (autocrlf=true)' ' } ' +test_expect_success '.gitattributes says two is binary' ' + + echo "two -crlf" >.gitattributes && + rm -f tmp one dir/two && + git repo-config core.autocrlf true && + git read-tree --reset -u HEAD && + + if remove_cr dir/two >/dev/null + then + echo "Huh?" + false + else + : happy + fi && + + if remove_cr one >/dev/null + then + : happy + else + echo "Huh?" + false + fi +' + test_done