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

From: Jeff King <peff@peff.net>
Date: Nov 16, 2010, 19:30 UTC
Message-ID: <20101116193018.GA31036@sigill.intra.peff.net>
In-Reply-To: <d0318dcd2b52f2e818888003e3dd81c7b713fec6.1289920242.git.git@drmicha.warpmail.net>

On Tue, Nov 16, 2010 at 04:11:17PM +0100, Michael J Gruber wrote:

Show 7 quoted lines

> Currently, cherry-pick -x sticks the pick note immediately after the
> existing commit message. This
> 
> * is bad for commits with 1 line subject (it makes a 2 line subject)
> * is different from git-svn, e.g., which leaves an empty line before.
> 
> Make cherry-pick always insert an empty line before the pick note.

Hmm. Should this respect pseudo-header blocks at the end? E.g., if I have:

  message subject

  Message body.

  Signed-off-by: Jeff King <peff@peff.net>

shouldn't it result in:

  message subject

  Message body.

  (cherry picked from commit ...)

  Signed-off-by: Jeff King <peff@peff.net>

Even better, I wonder if it should actually be:

  message subject

  Message body.

  Signed-off-by: Jeff King <peff@peff.net>
  Cherry-picked-from: ...

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.

Note that none of this is introduced by your patch. The current output for this case is terribly ugly. But I thought I would mention it, as my third version means we _do_ want the current behavior in some cases (i.e., when there is already a pseudo-header block).

-Peff