[PATCH v2 3/6] rebase -i: prepare to write reflog message for checkout
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 16, 2013, 08:45 UTC
- Message-ID
- <1371372316-16059-4-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1371372316-16059-1-git-send-email-artagnon@gmail.com>
The branch-flipping rebase -i internally does is not 'checkout' as far as the end-user is concerned; therefore, rebase -i 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 -i will write the following line to the reflog when started:
rebase -i (start): 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--interactive.sh | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f953d8d..0f04425 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -838,6 +838,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 +982,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.443.g4fd77b9