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 | b7bb8828cf202193bf7ac9bf61aa9434c2832e93 (patch) | |
| tree | 5e62f51bc354f94f515e74c848d8e2961133842a | |
| parent | 636de956c4a942ab3c247eba3a6dbb3113fa7ea8 (diff) | |
| parent | 500317ae03f635b247627eeb9760d9de2e343875 (diff) | |
Merge branch 'js/t3920-shell-and-or-fix'
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) && |