summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
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 /git-rebase--interactive.sh
parent03c4829347e26c844e589c61567a77a77c0658a9 (diff)
downloadgit-f5b49ea6191c2d631d1d70305b25d5db3bf05c92.tar.gz
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 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 1172e47571..89c39ebc9d 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -256,9 +256,8 @@ pick_one_preserving_merges () {
output git merge $STRATEGY -m "$msg" \
$new_parents
then
- git rerere
printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
- die Error redoing merge $sha1
+ die_with_patch $sha1 "Error redoing merge $sha1"
fi
;;
*)