git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/6] rebase -i: prepare to write reflog message for checkout
Date: Thu, 13 Jun 2013 19:02:26 +0530	[thread overview]
Message-ID: <1371130349-30651-4-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371130349-30651-1-git-send-email-artagnon@gmail.com>

Interactive rebase should never write "checkout: " messages to the
reflog, since it is highly confusing to the end user, and breaks
grab_nth_branch_checkout(), as demonstrated by failing tests
in t/checkout-last.  Set a sensible GIT_REFLOG_ACTION: checkout does not
respect GIT_REFLOG_ACTION yet, but this defect will be addressed in a
future patch.

When the defect is addressed, 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.384.g7cec0b4

  parent reply	other threads:[~2013-06-13 13:30 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-13 13:32 [PATCH 0/6] Fix git checkout - with rebase Ramkumar Ramachandra
2013-06-13 13:32 ` [PATCH 1/6] t/checkout-last: checkout - doesn't work after rebase Ramkumar Ramachandra
2013-06-13 17:46   ` Junio C Hamano
2013-06-13 18:30     ` Ramkumar Ramachandra
2013-06-13 20:38       ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 2/6] rebase: prepare to write reflog message for checkout Ramkumar Ramachandra
2013-06-13 17:51   ` Junio C Hamano
2013-06-13 18:05     ` Ramkumar Ramachandra
2013-06-13 13:32 ` Ramkumar Ramachandra [this message]
2013-06-13 17:52   ` [PATCH 3/6] rebase -i: " Junio C Hamano
2013-06-13 13:32 ` [PATCH 4/6] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-13 17:54   ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 5/6] status: do not depend on flaky reflog messages Ramkumar Ramachandra
2013-06-13 18:07   ` Junio C Hamano
2013-06-13 18:15     ` Ramkumar Ramachandra
2013-06-13 18:48     ` Ramkumar Ramachandra
2013-06-13 21:02       ` Junio C Hamano
2013-06-14  6:27         ` Ramkumar Ramachandra
2013-06-14 13:52           ` Junio C Hamano
2013-06-14 14:01             ` Ramkumar Ramachandra
2013-06-14 14:52               ` Junio C Hamano
2013-06-14 15:08                 ` Ramkumar Ramachandra
2013-06-14 16:31                   ` Junio C Hamano
2013-06-14 21:36                     ` Ramkumar Ramachandra
2013-06-14 22:16                       ` Junio C Hamano
2013-06-14 22:36                       ` Junio C Hamano
2013-06-14 23:07                         ` Junio C Hamano
2013-06-15  8:02                           ` Ramkumar Ramachandra
2013-06-15  9:58                             ` Junio C Hamano
2013-06-15 12:13                               ` Ramkumar Ramachandra
2013-06-15  8:44                         ` Ramkumar Ramachandra
2013-06-15  9:51                           ` Junio C Hamano
2013-06-15 12:08                             ` Ramkumar Ramachandra
2013-06-16  5:57                               ` Junio C Hamano
2013-06-16  6:07                                 ` Ramkumar Ramachandra
2013-06-15 10:26                           ` Junio C Hamano
2013-06-13 13:32 ` [PATCH 6/6] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1371130349-30651-4-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).