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/t3404-rebase-interactive.sh | |
| parent | t: fix moderate &&-chain breakage (diff) | |
| download | tgif-99094a7ad484085b9f6849a8ebe1e23467c5bc14.tar.xz | |
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/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index edad20df38..eed76cca55 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1007,7 +1007,7 @@ test_expect_success 'rebase -i with --strategy and -X' ' ' test_expect_success 'rebase -i error on commits with \ in message' ' - current_head=$(git rev-parse HEAD) + current_head=$(git rev-parse HEAD) && test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" && test_commit TO-REMOVE will-conflict old-content && test_commit "\temp" will-conflict new-content dummy && |