[PATCH 3/8] t3305: fix ignored exit code inside loop
- From
Jeff King <peff@peff.net>
- Date
- Mar 25, 2015, 05:28 UTC
- Message-ID
- <20150325052856.GC31924@peff.net>
- In-Reply-To
- <20150325052456.GA19394@peff.net>
When we test deleting notes, we run "git notes remove" in a loop. However, the exit value of the loop will only reflect the final note we process. We should break out of the loop with a failing exit code as soon as we see a problem.
Note that we can call "exit 1" here without explicitly creating a subshell, because the while loop on the right-hand side of a pipe executes in its own implicit subshell.
Note also that the "break" above does not suffer the same problem; it is meant to exit the loop early at a certain number of iterations. We can bump it into the conditional of the loop to make this more obvious.
Signed-off-by: Jeff King <peff@peff.net> --- t/t3305-notes-fanout.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh index b1ea64b..54460be 100755 --- a/t/t3305-notes-fanout.sh +++ b/t/t3305-notes-fanout.sh @@ -51,15 +51,12 @@ test_expect_success 'deleting most notes with git-notes' ' num_notes=250 && i=0 && git rev-list HEAD | - while read sha1 + while test $i -lt $num_notes && read sha1 do i=$(($i + 1)) && - if test $i -gt $num_notes - then - break - fi && test_tick && - git notes remove "$sha1" + git notes remove "$sha1" || + exit 1 done '
-- 2.3.4.635.gd6ffcfe