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 0/8] Re-roll rr/rebase-checkout-reflog
Date: Tue, 18 Jun 2013 17:44:22 +0530	[thread overview]
Message-ID: <1371557670-12534-1-git-send-email-artagnon@gmail.com> (raw)

This is a re-roll for rr/rebase-checkout-reflog, which is queued in
`pu`.

I've reviewed the changes carefully, and I believe that they are all
correct.  I've added a [6/8], because I think it is the correct way to
unset GIT_REFLOG_ACTION.

Junio: there is no need to re-export GIT_REFLOG_ACTION every time we
set it.  I've also fixed up some of your commit messages.  Let me know
if any further tweaks are necessary.

Thanks.

Junio C Hamano (1):
  t/status-help: test "HEAD detached from"

Ramkumar Ramachandra (7):
  wt-status: remove unused field in grab_1st_switch_cbdata
  t/checkout-last: test "checkout -" after a rebase
  status: do not depend on rebase reflog messages
  checkout: respect GIT_REFLOG_ACTION
  sh-setup: make die_with_status clear GIT_REFLOG_ACTION
  rebase: write better reflog messages
  rebase -i: write better reflog messages

 builtin/checkout.c         | 11 ++++++++---
 git-rebase--am.sh          |  2 ++
 git-rebase--interactive.sh |  3 +++
 git-rebase.sh              |  8 +++++++-
 git-sh-setup.sh            |  1 +
 t/t2012-checkout-last.sh   | 34 +++++++++++++++++++++++++++++++++
 t/t7512-status-help.sh     | 47 +++++++++++++++++++++++++---------------------
 wt-status.c                |  7 ++++---
 8 files changed, 85 insertions(+), 28 deletions(-)

-- 
1.8.3.1.456.gb7f4cb6

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

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-18 12:14 Ramkumar Ramachandra [this message]
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 ` [PATCH 8/8] rebase -i: " 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=1371557670-12534-1-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).