From: Ævar Arnfjörð Bjarmason Date: Thu, 14 Oct 2021 23:37:14 +0000 (+0200) Subject: commit-graph tests: fix error-hiding graph_git_two_modes() helper X-Git-Tag: v2.34.0-rc1~9^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3247919a758710692e316a13c209e13933936d51;p=thirdparty%2Fgit.git commit-graph tests: fix error-hiding graph_git_two_modes() helper The graph_git_two_modes() helper added in 177722b3442 (commit: integrate commit graph with commit parsing, 2018-04-10) didn't &&-chain its "git commit-graph" invocations, which as can be seen with SANITIZE=leak will happily mark tests as passing if both of these commands die, since test_cmp() will be comparing two empty files. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh index af88f805aa..579067299e 100755 --- a/t/t5318-commit-graph.sh +++ b/t/t5318-commit-graph.sh @@ -51,8 +51,8 @@ test_expect_success 'create commits and repack' ' ' graph_git_two_modes() { - git -c core.commitGraph=true $1 >output - git -c core.commitGraph=false $1 >expect + git -c core.commitGraph=true $1 >output && + git -c core.commitGraph=false $1 >expect && test_cmp expect output }