diff options
author | Jeff King <peff@peff.net> | 2015-03-25 08:28:57 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 20:23:58 +0300 |
commit | 6636cf7e907d889eb69fe645198e58c773b2f755 (patch) | |
tree | a5b780236a350e1e5f325f9ea2f756cbd60b7832 /t/t3305-notes-fanout.sh | |
parent | fd7771415b9447c8e53dd99d7946e00ee212d70d (diff) |
t3305: fix ignored exit code inside loop
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>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3305-notes-fanout.sh')
-rwxr-xr-x | t/t3305-notes-fanout.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh index b1ea64b213..54460beec4 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 ' |