Re: [PATCH] cherry-pick -x: add newline before pick note

From: Jay Soffian <jaysoffian@gmail.com>
Date: Nov 17, 2010, 06:14 UTC
Message-ID: <AANLkTinAWSNKK3VMY_jAy-8-M-80d_EvW299ZfVFPwpo@mail.gmail.com>
In-Reply-To: <20101116193018.GA31036@sigill.intra.peff.net>

On Tue, Nov 16, 2010 at 2:30 PM, Jeff King <peff@peff.net> wrote:

Show 9 quoted lines

> shouldn't it result in:
>
>  message subject
>
>  Message body.
>
>  (cherry picked from commit ...)
>
>  Signed-off-by: Jeff King <peff@peff.net>

+1.

Show 8 quoted lines

> 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.