[PATCH v2 2/6] rebase: prepare to write reflog message for checkout

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Jun 16, 2013, 08:45 UTC
Message-ID: <1371372316-16059-3-git-send-email-artagnon@gmail.com>
In-Reply-To: <1371372316-16059-1-git-send-email-artagnon@gmail.com>

The branch-flipping rebase internally does is not 'checkout' as far as the end-user is concerned; therefore, rebase should never write "checkout: " messages to the reflog. To achieve this, set a sensible GIT_REFLOG_ACTION; checkout does not respect this variable yet, but a future patch will change this.

After that patch, rebase will write the following line to the reflog when started:

  rebase: checkout master

This is much better than the confusing message it currently writes:

  checkout: moving from master to 1462b67

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 git-rebase.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/git-rebase.sh b/git-rebase.sh
index d0c11a9..6587019 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -568,6 +568,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="$GIT_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.443.g4fd77b9