From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/7] Re-roll rr/rebase-checkout-reflog
Date: Wed, 19 Jun 2013 00:25:30 +0530 [thread overview]
Message-ID: <1371581737-10013-1-git-send-email-artagnon@gmail.com> (raw)
In this iteration, I've redone [6/7] and [7/7] to address the "do not
leak GIT_REFLOG_ACTION" problem that Junio talked about. Predictably,
I couldn't convince myself to take Junio's subshell approach.
Instead, I've reworked the entire logic to have two variables:
GIT_REFLOG_ACTION and base_reflog_action. It is now elegant and
correct.
I'm elated that I got the chance to do this right.
Thanks.
Junio C Hamano (1):
t/t7512-status-help: test "HEAD detached from"
Ramkumar Ramachandra (6):
wt-status: remove unused field in grab_1st_switch_cbdata
t/t2012-checkout-last: test "checkout -" after a rebase
status: do not depend on rebase reflog messages
checkout: respect GIT_REFLOG_ACTION
rebase: write better reflog messages
rebase -i: write better reflog messages
builtin/checkout.c | 11 +++++++---
git-am.sh | 4 +++-
git-rebase--am.sh | 5 +++++
git-rebase--interactive.sh | 14 +++++++++----
git-rebase.sh | 13 ++++++++++--
t/t2012-checkout-last.sh | 34 +++++++++++++++++++++++++++++++
t/t3404-rebase-interactive.sh | 15 ++++++++++++++
t/t7512-status-help.sh | 47 ++++++++++++++++++++++++-------------------
wt-status.c | 7 ++++---
9 files changed, 116 insertions(+), 34 deletions(-)
--
1.8.3.1.455.g5932b31
next reply other threads:[~2013-06-18 18:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 18:55 Ramkumar Ramachandra [this message]
2013-06-18 18:55 ` [PATCH v2 1/7] t/t7512-status-help: test "HEAD detached from" Ramkumar Ramachandra
2013-06-18 18:55 ` [PATCH v2 2/7] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-18 18:55 ` [PATCH v2 3/7] t/t2012-checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-18 18:55 ` [PATCH v2 4/7] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-18 18:55 ` [PATCH v2 5/7] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-18 18:55 ` [PATCH v2 6/7] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-18 20:35 ` Junio C Hamano
2013-06-19 5:39 ` Johannes Sixt
2013-06-19 6:09 ` Ramkumar Ramachandra
2013-06-19 6:24 ` Johannes Sixt
2013-06-19 16:58 ` Junio C Hamano
2013-06-19 17:53 ` Junio C Hamano
2013-06-19 18:29 ` Junio C Hamano
2013-06-18 18:55 ` [PATCH v2 7/7] rebase -i: " Ramkumar Ramachandra
2013-06-18 20:36 ` Junio C Hamano
2013-06-18 20:38 ` Ramkumar Ramachandra
2013-06-18 20:55 ` Junio C Hamano
2013-06-19 4:07 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371581737-10013-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).