From: Felipe Contreras <felipe.contreras@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Martin von Zweigbergk <martinvonz@gmail.com>
Subject: Re: [PATCH v7 12/12] cherry-pick: copy notes and run hooks
Date: Thu, 24 Apr 2014 18:37:44 -0500 [thread overview]
Message-ID: <5359a048691f5_523614ed2ecd3@nysa.notmuch> (raw)
In-Reply-To: <CALkWK0=AywuFd1xaO3iXudhmnN1Sx2RDvhzmxLBjdaYD4OUB8w@mail.gmail.com>
Ramkumar Ramachandra wrote:
> Felipe Contreras wrote:
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 43631b4..fd085e1 100644
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -248,7 +248,7 @@ pick_one () {
> >
> > test -d "$rewritten" &&
> > pick_one_preserving_merges "$@" && return
> > - output eval git cherry-pick "$strategy_args" $empty_args $ff "$@"
> > + output eval git cherry-pick "--action-name ''" "$strategy_args" $empty_args $ff "$@"
>
> Passing an empty action-name looks quite ugly. Is there a better way
> to achieve this?
I want `git cherry-pick` to be able to do two things:
1) Omit the whole notes and hooks code
2) Specify a name other than "cherry-pick" to use for those
The --action-name argument achieves both.
--
Felipe Contreras
prev parent reply other threads:[~2014-04-24 23:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-24 2:44 [PATCH v7 00/12] Improvements to cherry-pick Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 01/12] cherry-pick: don't barf when there's nothing to do Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 02/12] cherry-pick: add --skip-empty option Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 03/12] revert/cherry-pick: add --quiet option Felipe Contreras
2014-04-24 22:48 ` Ramkumar Ramachandra
2014-04-24 23:33 ` Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 04/12] revert/cherry-pick: add --skip option Felipe Contreras
2014-04-24 22:50 ` Ramkumar Ramachandra
2014-04-24 2:44 ` [PATCH v7 05/12] cherry-pick: remember rerere-autoupdate Felipe Contreras
2014-04-24 8:21 ` Eric Sunshine
2014-04-24 2:44 ` [PATCH v7 06/12] builtin: add rewrite helper Felipe Contreras
2014-04-24 22:57 ` Ramkumar Ramachandra
2014-04-24 23:34 ` Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 07/12] cherry-pick: store rewritten commits Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 08/12] cherry-pick: don't store skipped commit Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 09/12] builtin: move run_rewrite_hook() to rewrite.c Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 10/12] builtin: rewrite: add copy_rewrite_notes() Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 11/12] cherry-pick: add --action-name option Felipe Contreras
2014-04-24 2:44 ` [PATCH v7 12/12] cherry-pick: copy notes and run hooks Felipe Contreras
2014-04-24 23:04 ` Ramkumar Ramachandra
2014-04-24 23:35 ` Felipe Contreras
2014-04-24 23:06 ` Ramkumar Ramachandra
2014-04-24 23:37 ` Felipe Contreras [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=5359a048691f5_523614ed2ecd3@nysa.notmuch \
--to=felipe.contreras@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=martinvonz@gmail.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).