summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-03-20 10:07:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-20 17:20:14 (GMT)
commit99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch)
treec47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t7600-merge.sh
parent60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff)
downloadgit-99094a7ad484085b9f6849a8ebe1e23467c5bc14.zip
git-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.gz
git-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.bz2
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/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index b164621..75c50ee 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -133,7 +133,7 @@ test_expect_success 'setup' '
test_tick &&
git commit -m "commit 3" &&
git tag c3 &&
- c3=$(git rev-parse HEAD)
+ c3=$(git rev-parse HEAD) &&
git reset --hard "$c0" &&
create_merge_msgs
'