aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:53 -0800
committerJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:53 -0800
commitdb2a91ba36c252cc198fad949e3b43b27034682b (patch)
treee14ab3526475d7263944c816b193d2a887415453
parente34fd1334c7ecaddbb83aca5175414a793782282 (diff)
parent77e04b2ed43c93c55ca4645be385c926b9102f6a (diff)
downloadgit-db2a91ba36c252cc198fad949e3b43b27034682b.tar.gz
Merge branch 'rs/t4205-do-not-exit-in-test-script' into maint-2.39
Test fix. * rs/t4205-do-not-exit-in-test-script: t4205: don't exit test script on failure
-rwxr-xr-xt/t4205-log-pretty-formats.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index fedb7ca749..3e7ad9d5de 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -156,7 +156,7 @@ test_expect_success 'NUL termination with --reflog --pretty=oneline' '
for r in $revs
do
git show -s --pretty=oneline "$r" >raw &&
- cat raw | lf_to_nul || exit 1
+ cat raw | lf_to_nul || return 1
done >expect &&
# the trailing NUL is already produced so we do not need to
# output another one