summaryrefslogtreecommitdiff
path: root/t/t0027-auto-crlf.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-19 22:34:14 (GMT)
commit643b62213e7da395354b578271f37711b6aed61b (patch)
tree2717fddbdc452d5b147c5e2ce8a9207f0a3d46d2 /t/t0027-auto-crlf.sh
parentaeb1b7f55d5db4eda968de5eb27f04d42df9edc1 (diff)
parenta0ad53c18100226cb1a138cb9b3bc3615170be8f (diff)
downloadgit-643b62213e7da395354b578271f37711b6aed61b.zip
git-643b62213e7da395354b578271f37711b6aed61b.tar.gz
git-643b62213e7da395354b578271f37711b6aed61b.tar.bz2
Merge branch 'tb/t0027-raciness-fix'
The t0027 test for CRLF conversion was timing dependent and flaky. * tb/t0027-raciness-fix: convert: Correct NNO tests and missing `LF will be replaced by CRLF`
Diffstat (limited to 't/t0027-auto-crlf.sh')
-rwxr-xr-xt/t0027-auto-crlf.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 2860d2d..90db54c 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -119,8 +119,7 @@ commit_chk_wrnNNO () {
fname=${pfx}_$f.txt &&
cp $f $fname &&
printf Z >>"$fname" &&
- git -c core.autocrlf=$crlf add $fname 2>/dev/null &&
- git -c core.autocrlf=$crlf commit -m "commit_$fname" $fname >"${pfx}_$f.err" 2>&1
+ git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err"
done
test_expect_success "commit NNO files crlf=$crlf attr=$attr LF" '
@@ -417,7 +416,8 @@ commit_chk_wrnNNO "text" "" false "$WILC" "$WICL" "$WAMIX" "$WILC
commit_chk_wrnNNO "text" "" true LF_CRLF "" LF_CRLF LF_CRLF ""
commit_chk_wrnNNO "text" "" input "" CRLF_LF CRLF_LF "" CRLF_LF
-test_expect_success 'create files cleanup' '
+test_expect_success 'commit NNO and cleanup' '
+ git commit -m "commit files on top of NNO" &&
rm -f *.txt &&
git -c core.autocrlf=false reset --hard
'