diff options
| author | Torsten Bögershausen <tboegi@web.de> | 2017-12-08 18:46:36 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-08 10:16:57 -0800 |
| commit | 649f1f0948a4ba7efbaa00f2cb0ff3ddec08a423 (patch) | |
| tree | bf159fc8995674b59b56c0b3d0ed59d6f1df90c0 | |
| parent | 86ff70a0f0d3917205e1aa82dba08db92d357cc0 (diff) | |
| download | git-tb/check-crlf-for-safe-crlf.tar.gz | |
t0027: Adapt the new MIX tests to Windowstb/check-crlf-for-safe-crlf
The new MIX tests don't pass under Windows, adapt them
to use the correct native line ending.
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0027-auto-crlf.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh index c2c208fdcd..7129896001 100755 --- a/t/t0027-auto-crlf.sh +++ b/t/t0027-auto-crlf.sh @@ -170,22 +170,22 @@ commit_MIX_chkwrn () { git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err" done - test_expect_success "commit file with mixed EOL crlf=$crlf attr=$attr LF" ' + test_expect_success "commit file with mixed EOL onto LF crlf=$crlf attr=$attr" ' check_warning "$lfwarn" ${pfx}_LF.err ' - test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF" ' + test_expect_success "commit file with mixed EOL onto CLRF attr=$attr aeol=$aeol crlf=$crlf" ' check_warning "$crlfwarn" ${pfx}_CRLF.err ' - test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF_mix_LF" ' + test_expect_success "commit file with mixed EOL onto CRLF_mix_LF attr=$attr aeol=$aeol crlf=$crlf" ' check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err ' - test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf LF_mix_cr" ' + test_expect_success "commit file with mixed EOL onto LF_mix_cr attr=$attr aeol=$aeol crlf=$crlf " ' check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err ' - test_expect_success "commit file with mixed EOL attr=$attr aeol=$aeol crlf=$crlf CRLF_nul" ' + test_expect_success "commit file with mixed EOL onto CRLF_nul attr=$attr aeol=$aeol crlf=$crlf" ' check_warning "$crlfnul" ${pfx}_CRLF_nul.err ' } @@ -378,7 +378,7 @@ test_expect_success 'setup master' ' printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\rLINETHREE" >CRLF_mix_CR && printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONEQ\r\nLINETWO\r\nLINETHREE" | q_to_nul >CRLF_nul && printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONEQ\nLINETWO\nLINETHREE" | q_to_nul >LF_nul && - create_NNO_MIX_files CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF && + create_NNO_MIX_files && git -c core.autocrlf=false add NNO_*.txt MIX_*.txt && git commit -m "mixed line endings" && test_tick @@ -441,13 +441,14 @@ test_expect_success 'commit files attr=crlf' ' ' # Commit "CRLFmixLF" on top of these files already in the repo: -# LF, CRLF, CRLFmixLF LF_mix_CR CRLFNULL +# mixed mixed mixed mixed mixed +# onto onto onto onto onto # attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL commit_MIX_chkwrn "" "" false "" "" "" "" "" commit_MIX_chkwrn "" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF" commit_MIX_chkwrn "" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF" -commit_MIX_chkwrn "auto" "" false "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF" +commit_MIX_chkwrn "auto" "" false "$WAMIX" "" "" "$WAMIX" "$WAMIX" commit_MIX_chkwrn "auto" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF" commit_MIX_chkwrn "auto" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF" |