@matheusbsbs / matheus-bagliano / commits / ecfe72ff65
Fork 0

rebase -i: give rerere a chance

Like non-interactive rebase, interactive mode now calls rerere when appropriate. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Nov 22, 2007 at 11:18 UTC ecfe72ff658124ea301ec7b2bb8b987689303685
1 file changed +4 -1
git-rebase--interactive.sh
+4 -1
@@ -90,6 +90,7 @@ make_patch () {
90
91 die_with_patch () {
92 make_patch "$1"
93 + git rerere
94 die "$2"
95 }
96
@@ -175,13 +176,13 @@ pick_one_preserving_merges () {
176 msg="$(git cat-file commit $sha1 | sed -e '1,/^$/d')"
177 # No point in merging the first parent, that's HEAD
178 new_parents=${new_parents# $first_parent}
178 - # NEEDSWORK: give rerere a chance
179 if ! GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME" \
180 GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" \
181 GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE" \
182 output git merge $STRATEGY -m "$msg" \
183 $new_parents
184 then
185 + git rerere
186 printf "%s\n" "$msg" > "$GIT_DIR"/MERGE_MSG
187 die Error redoing merge $sha1
188 fi
@@ -369,6 +370,7 @@ do
370 --abort)
371 comment_for_reflog abort
372
373 + git rerere clear
374 test -d "$DOTEST" || die "No interactive rebase running"
375
376 HEADNAME=$(cat "$DOTEST"/head-name)
@@ -385,6 +387,7 @@ do
387 --skip)
388 comment_for_reflog skip
389
390 + git rerere clear
391 test -d "$DOTEST" || die "No interactive rebase running"
392
393 output git reset --hard && do_rest