summaryrefslogtreecommitdiff
path: root/t/t7612-merge-verify-signatures.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 06:07:15 -0400
committerJunio C Hamano <gitster@pobox.com>2015-03-20 10:20:14 -0700
commit99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch)
treec47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t7612-merge-verify-signatures.sh
parent60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff)
downloadgit-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.gz
t: fix trivial &&-chain breakage
These are tests which are missing a link in their &&-chain, but during a setup phase. We may fail to notice failure in commands that build the test environment, but these are typically not expected to fail at all (but it's still good to double-check that our test environment is what we expect). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7612-merge-verify-signatures.sh')
-rwxr-xr-xt/t7612-merge-verify-signatures.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh
index 21a0bf8fb8..8ae69a61c3 100755
--- a/t/t7612-merge-verify-signatures.sh
+++ b/t/t7612-merge-verify-signatures.sh
@@ -29,7 +29,7 @@ test_expect_success GPG 'create signed commits' '
git checkout -b side-untrusted &&
echo 3 >baz && git add baz &&
- test_tick && git commit -SB7227189 -m "untrusted on side"
+ test_tick && git commit -SB7227189 -m "untrusted on side" &&
git checkout master
'