Only abort the individual check instead of exiting the whole test script if git show fails. Noticed with GIT_TEST_PASSING_SANITIZE_LEAK=check. Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx> Signed-off-by: René Scharfe <l.s.r@xxxxxx> --- Formatted with --function-context for easier review. ac52d9410e (t4205: cover `git log --reflog -z` blindspot, 2019-11-19) added the exit call. t/t4205-log-pretty-formats.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index e448ef2928..0404491d6e 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -154,12 +154,12 @@ done test_expect_success 'NUL termination with --reflog --pretty=oneline' ' revs="$(git rev-list --reflog)" && 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 git log -z --pretty=oneline --reflog >actual && test_cmp expect actual ' -- 2.30.2
