From: Jay Soffian <jaysoffian@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org,
Martin Svensson <martin.k.svensson@netinsight.se>
Subject: Re: [PATCH] cherry-pick -x: add newline before pick note
Date: Wed, 17 Nov 2010 01:14:16 -0500 [thread overview]
Message-ID: <AANLkTinAWSNKK3VMY_jAy-8-M-80d_EvW299ZfVFPwpo@mail.gmail.com> (raw)
In-Reply-To: <20101116193018.GA31036@sigill.intra.peff.net>
On Tue, Nov 16, 2010 at 2:30 PM, Jeff King <peff@peff.net> wrote:
> shouldn't it result in:
>
> message subject
>
> Message body.
>
> (cherry picked from commit ...)
>
> Signed-off-by: Jeff King <peff@peff.net>
+1.
> Even better, I wonder if it should actually be:
>
> message subject
>
> Message body.
>
> Signed-off-by: Jeff King <peff@peff.net>
> Cherry-picked-from: ...
+2.
> And then you could actually sign off the cherry-pick separately, too, if
> you wanted, by adding a line _below_ the cherry-picked-from. I have no
> idea if people are trying to grep for "cherry picked from commit...",
> which my proposal would break.
I can fix my regex easily enough, but I'd also be happy to have this
use some other switch than -x.
BTW, I notice that cherry-pick also misbehaves if the original commit
message doesn't end in a newline. I'm not sure whether that's a
cherry-pick bug for not checking that case, or whether it's a commit
bug for not ensuring a newline terminates the commit message.
j.
next prev parent reply other threads:[~2010-11-17 6:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-16 15:11 [PATCH] cherry-pick -x: add newline before pick note Michael J Gruber
2010-11-16 19:30 ` Jeff King
2010-11-16 20:25 ` [PATCH] commit -s: allow "(cherry picked " lines in sign-off section Jonathan Nieder
2010-11-16 20:40 ` Jonathan Nieder
2010-11-16 22:52 ` Junio C Hamano
2010-11-16 23:36 ` Jonathan Nieder
2010-11-17 16:46 ` Junio C Hamano
2010-11-17 6:23 ` Jay Soffian
2010-11-17 6:14 ` Jay Soffian [this message]
2011-03-08 12:54 ` [PATCH] cherry-pick -x: add newline before pick note Oswald Buddenhagen
2011-03-08 22:08 ` Jonathan Nieder
2011-03-08 22:18 ` Oswald Buddenhagen
2011-03-08 22:34 ` Jonathan Nieder
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=AANLkTinAWSNKK3VMY_jAy-8-M-80d_EvW299ZfVFPwpo@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=martin.k.svensson@netinsight.se \
--cc=peff@peff.net \
/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).