diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:54 -0800 |
| commit | 8ca2b1f2482652d141236b42bd853c7703e03f4d (patch) | |
| tree | 7e380f31b3fb9b049b92a913a0112596f47c89f4 | |
| parent | Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39 (diff) | |
| parent | t3920: support CR-eating grep (diff) | |
| download | git-8ca2b1f2482652d141236b42bd853c7703e03f4d.tar.gz git-8ca2b1f2482652d141236b42bd853c7703e03f4d.zip | |
Merge branch 'rs/t3920-crlf-eating-grep-fix' into maint-2.39
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) && |