[PATCH v2 6/7] rebase: write better reflog messages
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
Now that the "checkout" invoked internally from "rebase" knows to honor GIT_REFLOG_ACTION, we can start to use it to write a better reflog message when "rebase anotherbranch", "rebase --onto branch", etc. internally checks out the new fork point. We will write: rebase: checkout master instead of the old rebase Signed-off-by: Ramkumar Ramachandra <redacted> Signed-off-by: Junio C Hamano <redacted> --- git-am.sh | 4 +++- git-rebase--am.sh | 5 +++++ git-rebase.sh | 13 +++++++++++-- 3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 1cf3d1d..74ef9ca 100755
--- a/git-am.sh
+++ b/git-am.sh@@ -46,6 +46,8 @@ set_reflog_action am require_work_tree cd_to_toplevel +base_reflog_action="$GIT_REFLOG_ACTION" + git var GIT_COMMITTER_IDENT >/dev/null || die "$(gettext "You need to set your committer info first")"
@@ -884,7 +886,7 @@ did you forget to use 'git add'?" fi && git commit-tree $tree ${parent:+-p} $parent <"$dotest/final-commit" ) && - git update-ref -m "$GIT_REFLOG_ACTION: $FIRSTLINE" HEAD $commit $parent || + git update-ref -m "$base_reflog_action: $FIRSTLINE" HEAD $commit $parent || stop_here $this if test -f "$dotest/original-commit"; then
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 34e3102..69fae7a 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh@@ -5,11 +5,13 @@ case "$action" in continue) + GIT_REFLOG_ACTION="$base_reflog_action" git am --resolved --resolvemsg="$resolvemsg" && move_to_original_branch return ;; skip) + GIT_REFLOG_ACTION="$base_reflog_action" git am --skip --resolvemsg="$resolvemsg" && move_to_original_branch return
@@ -40,9 +42,11 @@ else rm -f "$GIT_DIR/rebased-patches" case "$head_name" in refs/heads/*) + GIT_REFLOG_ACTION="$base_reflog_action: checkout $head_name" git checkout -q "$head_name" ;; *) + GIT_REFLOG_ACTION="$base_reflog_action: checkout $orig_head" git checkout -q "$orig_head" ;; esac
@@ -59,6 +63,7 @@ else return $? fi + GIT_REFLOG_ACTION="$base_reflog_action" git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" <"$GIT_DIR/rebased-patches" ret=$?
diff --git a/git-rebase.sh b/git-rebase.sh
index d0c11a9..1c72120 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -47,6 +47,8 @@ set_reflog_action rebase require_work_tree_exists cd_to_toplevel +base_reflog_action="$GIT_REFLOG_ACTION" + LF=' ' ok_to_skip_pre_rebase=
@@ -336,7 +338,8 @@ then # Only interactive rebase uses detailed reflog messages if test "$type" = interactive && test "$GIT_REFLOG_ACTION" = rebase then - GIT_REFLOG_ACTION="rebase -i ($action)" + GIT_REFLOG_ACTION="rebase -i ($1)" + base_reflog_action="$GIT_REFLOG_ACTION" export GIT_REFLOG_ACTION fi fi
@@ -543,7 +546,11 @@ then if test -z "$force_rebase" then # Lazily switch to the target branch if needed... - test -z "$switch_to" || git checkout "$switch_to" -- + if test -n "$switch_to" + then + GIT_REFLOG_ACTION="$base_reflog_action: checkout $switch_to" + git checkout "$switch_to" -- + fi say "$(eval_gettext "Current branch \$branch_name is up to date.")" exit 0 else
@@ -568,6 +575,8 @@ test "$type" = interactive && run_specific_rebase # Detach HEAD and reset the tree say "$(gettext "First, rewinding head to replay your work on top of it...")" + +GIT_REFLOG_ACTION="$base_reflog_action: checkout $onto_name" git checkout -q "$onto^0" || die "could not detach HEAD" git update-ref ORIG_HEAD $orig_head
--
1.8.3.1.455.g5932b31