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>

Jeff King committed Mar 25, 2015 at 01:28 UTC 6636cf7e907d889eb69fe645198e58c773b2f755
1 file changed +3 -6
t/t3305-notes-fanout.sh
+3 -6
@@ -51,15 +51,12 @@ test_expect_success 'deleting most notes with git-notes' '
51 num_notes=250 &&
52 i=0 &&
53 git rev-list HEAD |
54 - while read sha1
54 + while test $i -lt $num_notes && read sha1
55 do
56 i=$(($i + 1)) &&
57 - if test $i -gt $num_notes
58 - then
59 - break
60 - fi &&
57 test_tick &&
62 - git notes remove "$sha1"
58 + git notes remove "$sha1" ||
59 + exit 1
60 done
61 '
62