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 8/8] rebase -i: write better reflog messages
Date: Tue, 18 Jun 2013 17:44:30 +0530	[thread overview]
Message-ID: <1371557670-12534-9-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371557670-12534-1-git-send-email-artagnon@gmail.com>

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 <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 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

      parent reply	other threads:[~2013-06-18 12:18 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 12:14 [PATCH 0/8] Re-roll rr/rebase-checkout-reflog Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 1/8] t/status-help: test "HEAD detached from" Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 2/8] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 3/8] t/checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 4/8] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-18 12:40   ` Peter Krefting
2013-06-18 12:14 ` [PATCH 5/8] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 16:53   ` Junio C Hamano
2013-06-18 16:56     ` Ramkumar Ramachandra
2013-06-18 12:14 ` [PATCH 6/8] sh-setup: make die_with_status clear GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 15:13   ` Junio C Hamano
2013-06-18 15:47     ` Ramkumar Ramachandra
2013-06-18 16:37       ` Junio C Hamano
2013-06-18 12:14 ` [PATCH 7/8] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-18 12:14 ` Ramkumar Ramachandra [this message]

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=1371557670-12534-9-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).