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>
Johannes Sixt committed
Dec 15, 2008 at 11:05 UTC
f5b49ea6191c2d631d1d70305b25d5db3bf05c92
2 files changed
+2
-3
git-rebase--interactive.sh
+1
-2
@@ -256,9 +256,8 @@ pick_one_preserving_merges () {
256
output git merge $STRATEGY -m "$msg" \
257
$new_parents
258
then
259
- git rerere
259
printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
261
- die Error redoing merge $sha1
260
+ die_with_patch $sha1 "Error redoing merge $sha1"
261
fi
262
;;
263
*)
t/t3409-rebase-preserve-merges.sh
+1
-1
@@ -75,7 +75,7 @@ test_expect_success 'rebase -p fakes interactive rebase' '
75
)
76
'
77
78
-test_expect_failure '--continue works after a conflict' '
78
+test_expect_success '--continue works after a conflict' '
79
(
80
cd clone2 &&
81
git fetch &&