undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/t3920-shell-and-or-fix' into maint-2.39

Browse Source 
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:
Junio C Hamano 2023-02-14 14:15:54 -08:00
commit 763ae829a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3920-crlf-messages.sh
View File

@ -12,7 +12,7 @@ create_crlf_ref () {
cat >.crlf-orig-$branch.txt && cat >.crlf-orig-$branch.txt &&
cat .crlf-orig-$branch.txt | append_cr >.crlf-message-$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 '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}" && LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" &&
test_tick && test_tick &&
hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) && hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) &&