From f5b49ea6191c2d631d1d70305b25d5db3bf05c92 Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 15 Dec 2008 11:05:31 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3409-rebase-preserve-merges.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') 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 && -- cgit v1.2.1