diff options
| author | Jeff King <peff@peff.net> | 2015-03-20 06:07:15 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 10:20:14 -0700 |
| commit | 99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch) | |
| tree | c47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t7600-merge.sh | |
| parent | 60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff) | |
| download | git-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/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b16462132f..75c50eea15 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 ' |