summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-02 23:01:02 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-02 23:01:02 -0800
commitac4d528ec18ae13a45166ef2afa9ffbba35f736f (patch)
treeb81f3cd367b2beeae8d1a7298f0b6fea6102764b /git-rebase--interactive.sh
parent0ebd5d7186237663a642397214232e5fe2fba21d (diff)
parentecfe72ff658124ea301ec7b2bb8b987689303685 (diff)
downloadgit-ac4d528ec18ae13a45166ef2afa9ffbba35f736f.tar.gz
Merge branch 'js/rebase-i-rerere'
* js/rebase-i-rerere: rebase -i: give rerere a chance
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index beeefec0e4..f83e00fe8f 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -95,6 +95,7 @@ make_patch () {
die_with_patch () {
make_patch "$1"
+ git rerere
die "$2"
}
@@ -180,13 +181,13 @@ pick_one_preserving_merges () {
msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
# No point in merging the first parent, that's HEAD
new_parents=${new_parents# $first_parent}
- # NEEDSWORK: give rerere a chance
if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
output git merge $STRATEGY -m "$msg" \
$new_parents
then
+ git rerere
printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
die Error redoing merge $sha1
fi
@@ -374,6 +375,7 @@ do
--abort)
comment_for_reflog abort
+ git rerere clear
test -d "$DOTEST" || die "No interactive rebase running"
HEADNAME=$(cat "$DOTEST"/head-name)
@@ -390,6 +392,7 @@ do
--skip)
comment_for_reflog skip
+ git rerere clear
test -d "$DOTEST" || die "No interactive rebase running"
output git reset --hard && do_rest