diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-19 11:46:14 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-19 11:46:14 +0900 |
| commit | 3c0a9886724be4624ec2c16078629acadddd66a3 (patch) | |
| tree | 82eca2a890544d10bf1c70d06f096e929dc95a3b | |
| parent | b7bb8828cf202193bf7ac9bf61aa9434c2832e93 (diff) | |
| parent | 86325d36e604e872e189e8dba6d914007918311f (diff) | |
| download | git-3c0a9886724be4624ec2c16078629acadddd66a3.tar.gz | |
Merge branch 'rs/t3920-crlf-eating-grep-fix'
Test fix.
* rs/t3920-crlf-eating-grep-fix:
t3920: support CR-eating grep
| -rwxr-xr-x | t/t3920-crlf-messages.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh index a58522c163..67fd2345af 100755 --- a/t/t3920-crlf-messages.sh +++ b/t/t3920-crlf-messages.sh @@ -12,7 +12,7 @@ create_crlf_ref () { cat >.crlf-orig-$branch.txt && cat .crlf-orig-$branch.txt | append_cr >.crlf-message-$branch.txt && grep 'Subject' .crlf-orig-$branch.txt | tr '\n' ' ' | sed 's/[ ]*$//' | tr -d '\n' >.crlf-subject-$branch.txt && - { grep 'Body' .crlf-message-$branch.txt >.crlf-body-$branch.txt || true; } && + grep 'Body' .crlf-orig-$branch.txt | append_cr >.crlf-body-$branch.txt && LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" && test_tick && hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) && |