diff options
author | Jeff King <peff@peff.net> | 2015-03-20 13:07:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-20 20:20:14 +0300 |
commit | 99094a7ad484085b9f6849a8ebe1e23467c5bc14 (patch) | |
tree | c47fba4be6766c5ec5bec48108fe1e96ce22bb40 /t/t3425-rebase-topology-merges.sh | |
parent | 60687de5ba3eb90f8332fb1bcec73a2cb782c95c (diff) |
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/t3425-rebase-topology-merges.sh')
-rwxr-xr-x | t/t3425-rebase-topology-merges.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh index 1d195fbd64..846f85c27e 100755 --- a/t/t3425-rebase-topology-merges.sh +++ b/t/t3425-rebase-topology-merges.sh @@ -24,7 +24,7 @@ test_expect_success 'setup of non-linear-history' ' test_commit c && git checkout b && test_commit d && - test_commit e + test_commit e && git checkout c && test_commit g && @@ -33,7 +33,7 @@ test_expect_success 'setup of non-linear-history' ' cherry_pick gp g && test_commit i && git checkout b && - test_commit f + test_commit f && git checkout d && test_commit n && |