aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2008-12-15 11:05:31 +0100
committerJunio C Hamano <gitster@pobox.com>2008-12-21 01:08:51 -0800
commitf5b49ea6191c2d631d1d70305b25d5db3bf05c92 (patch)
treef341e3f91d09639cb194557ffc0a821eef5ae146 /t
parent03c4829347e26c844e589c61567a77a77c0658a9 (diff)
downloadgit-f5b49ea6191c2d631d1d70305b25d5db3bf05c92.tar.gz
git-f5b49ea6191c2d631d1d70305b25d5db3bf05c92.tar.xz
rebase -i -p: Fix --continue after a merge could not be redone
When a merge that has a conflict was rebased, then rebase stopped to let the user resolve the conflicts. However, thereafter --continue failed because the author-script was not saved. (This is rebase -i's way to preserve a commit's authorship.) This fixes it by doing taking the same failure route after a merge that is also taken after a normal cherry-pick. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3409-rebase-preserve-merges.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 5ddd1d1a9..820e0105d 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -75,7 +75,7 @@ test_expect_success 'rebase -p fakes interactive rebase' '
)
'
-test_expect_failure '--continue works after a conflict' '
+test_expect_success '--continue works after a conflict' '
(
cd clone2 &&
git fetch &&