From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v3 6/7] rebase: write better reflog messages
Date: Sun, 23 Jun 2013 20:26:29 -0700 [thread overview]
Message-ID: <7vfvw8dw9m.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1371629089-27008-7-git-send-email-artagnon@gmail.com> (Ramkumar Ramachandra's message of "Wed, 19 Jun 2013 13:34:48 +0530")
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> @@ -59,6 +63,9 @@ else
> return $?
> fi
>
> + # always reset GIT_REFLOG_ACTION before calling any external
> + # scripts; they have no idea about our base_reflog_action
> + GIT_REFLOG_ACTION="$base_reflog_action"
> git am $git_am_opt --rebasing --resolvemsg="$resolvemsg"
Why does this reroll still use this base_reflog_action convention?
The original orig_reflog_action you borrowed this may have been an
acceptable local solution inside
git-rebase--interactive that does not call out to amyting, but
the above comment a good demonstration that shows why this cannot be
a good general solution that scales across scriptlets.
And I already explained that to you at least twice.
cf. http://article.gmane.org/gmane.comp.version-control.git/228399
But after writing it down this way, I realize that introduction of
base_reflog_action (or GIT_REFLOG_NAME which is a moral equivalent)
is not helping us at all. As long as calls to "git" command in the
second category exists in these scripts, GIT_REFLOG_ACTION *must* be
kept pristine after set_reflog_action sets it, so we can get rid of
this new variable, and rewrite 3.a and 3.b like so:
3-a)
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: custom message" \
git cmd
3-b)
SAVED=$GIT_REFLOG_ACTION
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: custom message"
output git cmd
GIT_REFLOG_ACTION=$SAVED
or
(
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: custom message"
output git cmd
)
That essentially boils down to the very original suggestion I made
before Ram introduced the base_reflog_action.
next prev parent reply other threads:[~2013-06-24 3:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 8:04 [PATCH v3 0/7] Re-roll rr/rebase-checkout-reflog Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 1/7] t/t7512-status-help: test "HEAD detached from" Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 2/7] wt-status: remove unused field in grab_1st_switch_cbdata Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 3/7] t/t2012-checkout-last: test "checkout -" after a rebase Ramkumar Ramachandra
2013-06-19 9:10 ` Johannes Sixt
2013-06-19 9:41 ` Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 4/7] status: do not depend on rebase reflog messages Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 5/7] checkout: respect GIT_REFLOG_ACTION Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 6/7] rebase: write better reflog messages Ramkumar Ramachandra
2013-06-24 3:26 ` Junio C Hamano [this message]
2013-06-24 7:07 ` Ramkumar Ramachandra
2013-06-24 7:57 ` Junio C Hamano
2013-06-24 8:12 ` Ramkumar Ramachandra
2013-06-19 8:04 ` [PATCH v3 7/7] 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
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=7vfvw8dw9m.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/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).