From e8736d2b3b9d2eb619aed3208e4844d7bed399a5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sat, 18 Jul 2015 09:23:07 +0200 Subject: [PATCH] fixup! Teach t0027 about native end-of-lines --- t/t0027-auto-crlf.sh | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index b0b60971f6..e671007bdb 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -55,17 +55,11 @@ create_gitattributes () { esac } -# Some warnings depend on the native end-of-line marker - -test_have_prereq NATIVE_CRLF && -NATIVE_CRLF=t || -NATIVE_CRLF= - check_warning () { - case "$1,$NATIVE_CRLF" in - LF_CRLF,*|MAYBE_CRLF,t|MIX,t) grep "LF will be replaced by CRLF" $2;; - CRLF_LF,*|MAYBE_LF,|MIX,) grep "CRLF will be replaced by LF" $2;; - ,*|MAYBE_CRLF,|MAYBE_LF,t) + case "$1" in + LF_CRLF) grep "LF will be replaced by CRLF" $2;; + CRLF_LF) grep "CRLF will be replaced by LF" $2;; + '') >expect grep "will be replaced by" $2 >actual test_cmp expect actual @@ -181,17 +175,16 @@ test_expect_success 'add files empty attr' ' create_file_in_repo input "" "" "CRLF_LF" "CRLF_LF" "" "" ' - test_expect_success 'add files attr=auto' ' - create_file_in_repo false "auto" "MAYBE_CRLF" "MAYBE_LF" "MIX" "" "" && - create_file_in_repo true "auto" "LF_CRLF" "" "LF_CRLF" "" "" && - create_file_in_repo input "auto" "" "CRLF_LF" "CRLF_LF" "" "" + create_file_in_repo false "auto" "" "CRLF_LF" "CRLF_LF" "" "" && + create_file_in_repo true "auto" "LF_CRLF" "" "LF_CRLF" "" "" && + create_file_in_repo input "auto" "" "CRLF_LF" "CRLF_LF" "" "" ' test_expect_success 'add files attr=text' ' - create_file_in_repo false "text" "MAYBE_CRLF" "MAYBE_LF" "MIX" "MAYBE_CRLF" "MAYBE_LF" && - create_file_in_repo true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" && - create_file_in_repo input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" + create_file_in_repo false "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" && + create_file_in_repo true "text" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" "" && + create_file_in_repo input "text" "" "CRLF_LF" "CRLF_LF" "" "CRLF_LF" ' test_expect_success 'add files attr=-text' '