summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2022-02-11 16:55:57 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-02-11 16:55:57 -0800
commit8db2f665e1b25c2e88ddb00b402a4aa3b73a4cf4 (patch)
tree1d29355e3df139e3b137aa577c42ee8ef74b6ef7 /t
parentThe second batch for 2.36 (diff)
parentdocs: correct documentation about eol attribute (diff)
downloadtgif-8db2f665e1b25c2e88ddb00b402a4aa3b73a4cf4.tar.xz
Merge branch 'bc/clarify-eol-attr'
Doc and test update around the eol attribute. * bc/clarify-eol-attr: docs: correct documentation about eol attribute t0027: add tests for eol without text in .gitattributes
Diffstat (limited to 't')
-rwxr-xr-xt/t0027-auto-crlf.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 4a5c5c602c..c5f7ac63b0 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -597,6 +597,12 @@ do
# auto: core.autocrlf=false and core.eol unset(or native) uses native eol
checkout_files auto "$id" "" false "" $NL CRLF CRLF_mix_LF LF_mix_CR LF_nul
checkout_files auto "$id" "" false native $NL CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ # core.autocrlf false, .gitattributes sets eol
+ checkout_files "" "$id" "lf" false "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files "" "$id" "crlf" false "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
+ # core.autocrlf true, .gitattributes sets eol
+ checkout_files "" "$id" "lf" true "" LF CRLF CRLF_mix_LF LF_mix_CR LF_nul
+ checkout_files "" "$id" "crlf" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
done
# The rest of the tests are unique; do the usual linting.