]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t0008: silence error in subshell when using `grep -v`
authorPatrick Steinhardt <ps@pks.im>
Tue, 21 Apr 2026 07:34:21 +0000 (09:34 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Apr 2026 22:53:36 +0000 (15:53 -0700)
In t0008 we use `grep -v` in a subshell, but expect that this command
will sometimes not match anything. This would cause grep(1) to return an
error code, but given that we don't run with `set -e` we swallow this
error.

We're about to enable `set -e`. Prepare for this by ignoring any errors.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t0008-ignores.sh

index e716b5cdfa1bee29ed257e1a9524d37cb4b2a146..d77a179bddcbed0326b868288831240b1369c9bd 100755 (executable)
@@ -122,8 +122,8 @@ test_expect_success_multiple () {
        fi
        testname="$1" expect_all="$2" code="$3"
 
-       expect_verbose=$( echo "$expect_all" | grep -v '^::     ' )
-       expect=$( echo "$expect_verbose" | sed -e 's/.* //' )
+       expect_verbose=$(echo "$expect_all" | grep -v '^::      ' || :)
+       expect=$(echo "$expect_verbose" | sed -e 's/.*  //')
 
        test_expect_success $prereq "$testname${no_index_opt:+ with $no_index_opt}" '
                expect "$expect" &&