From: Patrick Steinhardt <ps@pks.im>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH 02/12] t: prepare `test_must_fail ()` for `set -e`
Date: Wed, 15 Apr 2026 08:58:40 +0200 [thread overview]
Message-ID: <ad83IHKLtO4-gsG-@pks.im> (raw)
In-Reply-To: <xmqq5x5tbfsm.fsf@gitster.g>
On Tue, Apr 14, 2026 at 10:41:29AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Mon, Apr 13, 2026 at 11:49:23AM +0200, Patrick Steinhardt wrote:
> >
> >> diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
> >> index f3af10fb7e..f8bc77619b 100644
> >> --- a/t/test-lib-functions.sh
> >> +++ b/t/test-lib-functions.sh
> >> @@ -1195,8 +1195,12 @@ test_must_fail () {
> >> echo >&7 "test_must_fail: only 'git' is allowed: $*"
> >> return 1
> >> fi
> >> - "$@" 2>&7
> >> - exit_code=$?
> >> + if "$@" 2>&7
> >> + then
> >> + exit_code=0
> >> + else
> >> + exit_code=$?
> >> + fi
> >
> > One subtle interaction here is that the command in "$@" will be run with
> > "set -e" suppressed if it's a shell function (even if the body
> > explicitly says "set -e").
> >
> > I think it's mostly academic since we don't tend to use "set -e" in the
> > tests at all, but it may be an eventual gotcha.
>
> Yeah, ugly, but this is tricky that they felt the need to explain it
> with an example in the informative section X-<.
>
> "set" is described in
>
> https://pubs.opengroup.org/onlinepubs/9799919799/utilities/V3_chap02.html#tag_19_26
>
> and the description for "-e" does not even talk about any function.
> The application usage notes associated with the "set" gives this
>
> Application writers should avoid relying on set -e within
> functions. For example, in the following script:
>
> set -e
> start() {
> some_server
> echo some_server started successfully
> }
> start || echo >&2 some_server failed
>
> the -e setting is ignored within the function body (because the
> function is a command in an AND-OR list other than the
> last). Therefore, if some_server fails, the function carries on to
> echo "some_server started successfully", and the exit status of the
> function is zero (which means "some_server failed" is not output).
>
> which greatly helps.
The funny thing is that I discovered shells where this is not the case,
and `set -e` _does_ extend into functions. Anyway, I think I'll follow
Peff's suggestion and just enable `set -e` for Bash 5 and newer. This
should ensure that the behaviour is a lot more uniform without having
negative fallout on other platforms that don't use Bash, but we'd still
get a failing CI as we use Bash in some of the jobs.
Patrick
next prev parent reply other threads:[~2026-04-15 6:58 UTC|newest]
Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-13 9:49 [PATCH 00/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-13 16:26 ` Junio C Hamano
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-14 17:49 ` Junio C Hamano
2026-04-13 9:49 ` [PATCH 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-13 16:33 ` Junio C Hamano
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-14 6:23 ` Jeff King
2026-04-14 17:41 ` Junio C Hamano
2026-04-15 6:58 ` Patrick Steinhardt [this message]
2026-04-16 5:40 ` Jeff King
2026-04-13 9:49 ` [PATCH 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-13 16:53 ` Junio C Hamano
2026-04-13 9:49 ` [PATCH 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-13 16:59 ` Junio C Hamano
2026-04-13 9:49 ` [PATCH 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-13 17:04 ` Junio C Hamano
2026-04-13 9:49 ` [PATCH 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-13 17:09 ` Junio C Hamano
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-14 13:41 ` Junio C Hamano
2026-04-13 22:32 ` Junio C Hamano
2026-04-14 1:09 ` Junio C Hamano
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-14 13:40 ` Junio C Hamano
2026-04-14 22:03 ` Jeff King
2026-04-14 22:52 ` Jeff King
2026-04-14 23:08 ` Jeff King
2026-04-15 6:48 ` Patrick Steinhardt
2026-04-16 5:49 ` Jeff King
2026-04-16 8:03 ` Patrick Steinhardt
2026-04-16 14:34 ` Junio C Hamano
2026-04-18 8:01 ` Jeff King
2026-04-15 15:31 ` Junio C Hamano
2026-04-13 9:49 ` [PATCH 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-13 17:23 ` Junio C Hamano
2026-04-14 7:24 ` Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-13 17:28 ` Junio C Hamano
2026-04-14 7:23 ` Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-13 9:49 ` [PATCH 12/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-13 17:29 ` Junio C Hamano
2026-04-13 21:33 ` [PATCH 00/12] " Junio C Hamano
2026-04-13 21:46 ` Junio C Hamano
2026-04-15 13:06 ` [PATCH v2 " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-15 13:06 ` [PATCH v2 12/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-16 6:00 ` Jeff King
2026-04-16 10:46 ` Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 00/12] " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-16 20:12 ` SZEDER Gábor
2026-04-16 20:42 ` Junio C Hamano
2026-04-17 9:44 ` Patrick Steinhardt
2026-04-16 11:19 ` [PATCH v3 12/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-16 16:06 ` Junio C Hamano
2026-04-17 10:50 ` [PATCH v4 00/12] " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-17 10:50 ` [PATCH v4 12/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-18 6:50 ` Jeff King
2026-04-18 12:17 ` Ben Knoble
2026-04-18 17:44 ` Jeff King
2026-04-18 19:24 ` Junio C Hamano
2026-04-18 21:05 ` Jeff King
2026-04-20 6:11 ` Patrick Steinhardt
2026-04-18 19:17 ` brian m. carlson
2026-04-18 21:30 ` Jeff King
2026-04-18 21:54 ` brian m. carlson
2026-04-19 2:10 ` Jeff King
2026-04-20 7:27 ` [PATCH v5 00/12] " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-20 7:27 ` [PATCH v5 12/12] t: detect errors outside of test cases Patrick Steinhardt
2026-04-20 16:19 ` [PATCH v5 00/12] " Junio C Hamano
2026-04-21 3:00 ` Jeff King
2026-04-21 5:41 ` Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 01/12] t: prepare `test_match_signal ()` calls for `set -e` Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 02/12] t: prepare `test_must_fail ()` " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 03/12] t: prepare `stop_git_daemon " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 04/12] t: prepare `git config --unset` calls " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 05/12] t: prepare conditional test execution " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 06/12] t: prepare execution of potentially failing commands " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 07/12] t: prepare `test_when_finished ()`/`test_atexit()` " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 08/12] t0008: silence error in subshell when using `grep -v` Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 09/12] t1301: don't fail in case setfacl(1) doesn't exist or fails Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 10/12] t6002: fix use of `expr` with `set -e` Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 11/12] t9902: fix use of `read` " Patrick Steinhardt
2026-04-21 7:34 ` [PATCH v6 12/12] t: detect errors outside of test cases Patrick Steinhardt
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ad83IHKLtO4-gsG-@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox