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 | 763ae829a3fa3652d00e614fbf9c17cfb942682d (patch) | |
| tree | 4b391de3ef2c11531f42fffd526bbbca5fec9348 | |
| parent | 81b216e4f7a338a9137a6faac8c41ba880b24cff (diff) | |
| parent | 500317ae03f635b247627eeb9760d9de2e343875 (diff) | |
| download | git-763ae829a3fa3652d00e614fbf9c17cfb942682d.tar.gz | |
Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39
Test fix.
* js/t3920-shell-and-or-fix:
t3920: don't ignore errors of more than one command with `|| true`
| -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 4c661d4d54..a58522c163 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-message-$branch.txt >.crlf-body-$branch.txt || true; } && LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" && test_tick && hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) && |