Re: [PATCH] cherry-pick -x: add newline before pick note
From: Jay Soffian <hidden>
Date: 2016-06-15 22:50:03
On Tue, Nov 16, 2010 at 2:30 PM, Jeff King [off-list ref] wrote:
shouldn't it result in: message subject Message body. (cherry picked from commit ...) Signed-off-by: Jeff King [off-list ref]
+1.
Even better, I wonder if it should actually be: message subject Message body. Signed-off-by: Jeff King [off-list ref] 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.