[PATCH v2 0/7] Re-roll rr/rebase-checkout-reflog
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Jun 18, 2013, 18:55 UTC
- Message-ID
- <1371581737-10013-1-git-send-email-artagnon@gmail.com>
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