mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
t3920: don't ignore errors of more than one command with || true
It is customary to write `A || true` to ignore a potential error exit of command A. But when we have a sequence `A && B && C || true && D`, then a failure of any of A, B, or C skips to D right away. This is not intended here. Turn the command whose failure is to be ignored into a compound command to ensure it is the only one that is allowed to fail. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e7e5c6f715
commit
500317ae03
|
@ -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) &&
|
||||
|
|
Loading…
Reference in a new issue