From: "René Scharfe" <l.s.r@web.de>
To: Johannes Sixt <j6t@kdbg.org>,
Philippe Blain <levraiphilippeblain@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] t3920: don't ignore errors of more than one command with `|| true`
Date: Mon, 21 Nov 2022 23:56:37 +0100 [thread overview]
Message-ID: <eed47577-1e47-2fbb-6344-fd4ae324f6b6@web.de> (raw)
In-Reply-To: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>
Am 21.11.22 um 18:58 schrieb Johannes Sixt:
> 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.
Good catch!
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> t/t3920-crlf-messages.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 &&
Useless use of cat.
> grep 'Subject' .crlf-orig-$branch.txt | tr '\n' ' ' | sed 's/[ ]*$//' | tr -d '\n' >.crlf-subject-$branch.txt &&
My knee-jerk reaction to long lines like this is to pull out awk:
awk '/Subject/ {printf "%s", sep $0; sep = " "}' .crlf-orig-$branch.txt >.crlf-subject-$branch.txt &&
This is not a faithful conversion because the original trims all
spaces from the end of the subject for some reason. That would be:
awk '/Subject/ {s = s $0 " "} END {sub(/ *$/, "", s); printf "%s", s}' .crlf-orig-$branch.txt >.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; } &&
OK, back on topic: Adding CRs explicitly instead of relying on grep to
pass them through (which it doesn't on MinGW) also ignores the return
value of grep as a side effect of the pipe:
grep 'Body' .crlf-orig-$branch.txt | append_cr >.crlf-body-$branch.txt &&
> LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" &&
> test_tick &&
> hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) &&
next prev parent reply other threads:[~2022-11-21 22:56 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-21 17:58 [PATCH] t3920: don't ignore errors of more than one command with `|| true` Johannes Sixt
2022-11-21 22:56 ` René Scharfe [this message]
2022-11-22 0:53 ` Junio C Hamano
2022-11-22 18:28 ` Philippe Blain
2022-11-22 22:24 ` Ævar Arnfjörð Bjarmason
2022-11-22 22:37 ` Johannes Sixt
2022-11-22 22:57 ` Ævar Arnfjörð Bjarmason
2022-11-23 0:55 ` Junio C Hamano
2022-12-02 16:51 ` [PATCH 2/1] t3920: support CR-eating grep René Scharfe
2022-12-02 23:14 ` Philippe Blain
2022-12-03 7:09 ` René Scharfe
2022-12-02 23:32 ` Eric Sunshine
2022-12-03 7:12 ` René Scharfe
2022-12-05 1:08 ` Junio C Hamano
2022-12-05 8:28 ` René Scharfe
2022-12-05 9:32 ` Junio C Hamano
2022-12-05 10:43 ` René Scharfe
2022-12-02 16:51 ` [PATCH 3/1] t3920: simplify redirection of loop output René Scharfe
2022-12-02 16:51 ` [PATCH 4/1] t3920: replace two cats with a tee René Scharfe
2022-12-03 5:09 ` Eric Sunshine
2022-12-03 8:43 ` René Scharfe
2022-12-03 12:53 ` Ævar Arnfjörð Bjarmason
2022-12-03 17:22 ` René Scharfe
2022-12-04 9:34 ` Ævar Arnfjörð Bjarmason
2022-12-04 16:39 ` Eric Sunshine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eed47577-1e47-2fbb-6344-fd4ae324f6b6@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=levraiphilippeblain@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).