t7510: use consistent &&-chains in loop

We check multiple commits in a loop. Because we want to break out of the loop if any single iteration fails, we use a subshell/exit like: ( for i in $stuff do do-something $i || exit 1 done ) However, we are inconsistent in our loop body. Some commands get their own "|| exit 1", and others try to chain to the next command with "&&", like: X && Y || exit 1 Z || exit 1 This is a little hard to read and follow, because X and Y are treated differently for no good reason. But much worse, the second loop follows a similar pattern and gets it wrong. "Y" is expected to fail, so we use "&& exit 1", giving us: X && Y && exit 1 Z || exit 1 That gets the test for X wrong (we do not exit unless both X fails and Y unexpectedly succeeds, but we would want to exit if _either_ is wrong). We can write this clearly and correctly by consistently using "&&", followed by a single "|| exit 1", and negating Y with "!" (as we would in a normal &&-chain). Like: X && ! Y && Z || exit 1 Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael J Gruber committed Jun 16, 2014 at 20:03 UTC 7b1732c11605f84b809bd120401df49866c27141
1 file changed +6 -6
t/t7510-signed-commit.sh
+6 -6
@@ -50,18 +50,18 @@ test_expect_success GPG 'show signatures' '
50 for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
51 do
52 git show --pretty=short --show-signature $commit >actual &&
53 - grep "Good signature from" actual || exit 1
54 - ! grep "BAD signature from" actual || exit 1
55 - echo $commit OK
53 + grep "Good signature from" actual &&
54 + ! grep "BAD signature from" actual &&
55 + echo $commit OK || exit 1
56 done
57 ) &&
58 (
59 for commit in merge^2 fourth-unsigned sixth-unsigned seventh-unsigned
60 do
61 git show --pretty=short --show-signature $commit >actual &&
62 - grep "Good signature from" actual && exit 1
63 - ! grep "BAD signature from" actual || exit 1
64 - echo $commit OK
62 + ! grep "Good signature from" actual &&
63 + ! grep "BAD signature from" actual &&
64 + echo $commit OK || exit 1
65 done
66 )
67 '