mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
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`
This commit is contained in:
commit
763ae829a3
|
@ -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