[PATCH 8/8] rebase -i: write better reflog messages
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:48
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that the "checkout" invoked internally from "rebase -i" knows to honor GIT_REFLOG_ACTION, we can start to use it to write a better reflog message when "rebase -i anotherbranch", "rebase -i --onto branch", etc. internally checks out the new fork point. We will write: rebase -i (start): checkout master instead of the old rebase -i (start) Signed-off-by: Ramkumar Ramachandra <redacted> Signed-off-by: Junio C Hamano <redacted> --- git-rebase--interactive.sh | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index f953d8d..5179500 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -326,6 +326,7 @@ pick_one_preserving_merges () { if [ "$1" != "-n" ] then # detach HEAD to current parent + GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $first_parent" output git checkout $first_parent 2> /dev/null || die "Cannot move HEAD to $first_parent" fi
@@ -838,6 +839,7 @@ comment_for_reflog start if test ! -z "$switch_to" then + GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" output git checkout "$switch_to" -- || die "Could not checkout $switch_to" fi
@@ -981,6 +983,7 @@ has_action "$todo" || test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks +GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $onto_name" output git checkout $onto || die_abort "could not detach HEAD" git update-ref ORIG_HEAD $orig_head do_rest
--
1.8.3.1.456.gb7f4cb6