diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-19 15:34:14 -0700 |
| commit | 643b62213e7da395354b578271f37711b6aed61b (patch) | |
| tree | 2717fddbdc452d5b147c5e2ce8a9207f0a3d46d2 /t | |
| parent | aeb1b7f55d5db4eda968de5eb27f04d42df9edc1 (diff) | |
| parent | a0ad53c18100226cb1a138cb9b3bc3615170be8f (diff) | |
| download | git-643b62213e7da395354b578271f37711b6aed61b.tar.gz git-643b62213e7da395354b578271f37711b6aed61b.tar.xz | |
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')
| -rwxr-xr-x | t/t0027-auto-crlf.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index 2860d2d08..90db54c9f 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 ' |