diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-01 10:34:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-01 10:34:42 -0800 |
| commit | b365dafe2360c12353259432a2940c6123cd2b52 (patch) | |
| tree | 3a44c43c393af77be58d0832fb07554ce08e9e8d /t | |
| parent | 55e9f0e5c9a918c246b7eae1fe2a2e954f6426af (diff) | |
| parent | a0ad53c18100226cb1a138cb9b3bc3615170be8f (diff) | |
| download | git-b365dafe2360c12353259432a2940c6123cd2b52.tar.gz git-b365dafe2360c12353259432a2940c6123cd2b52.tar.xz | |
Merge branch 'tb/t0027-raciness-fix' into jc/renormalize-merge-kill-safer-crlf
* 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 ' |