Re: commit a1f6baa5 (wrap long header lines) breaks my habit

From: Jeff King <peff@peff.net>
Date: May 26, 2011, 20:36 UTC
Message-ID: <20110526203625.GA31018@sigill.intra.peff.net>
In-Reply-To: <20110525154046.GC7723@scotty.home>

On Wed, May 25, 2011 at 05:40:46PM +0200, Stefan-W. Hahn wrote:

Show 11 quoted lines

> > With "am -k", it does keep the fold. This is an artifact of the original
> > behavior, where the folds were literally included from a multi-line
> 
> Correct, I checked this, so with
> 
>    git format-patch -k --stdout a..b | git am -3
> (no second -k)
> 
> all is as before. 
> 
> Thanks for your clarification, sorry for the noise.

Actually, I don't think it's noise. Look at the documentation patch you suggest:

Show 10 quoted lines

> index d13c9b2..4e62248 100644
> --- a/Documentation/git-format-patch.txt
> +++ b/Documentation/git-format-patch.txt
> @@ -468,6 +468,16 @@ the current branch using 'git am' to cherry-pick them:
>  ------------
>  $ git format-patch -k --stdout R1..R2 | git am -3 -k
>  ------------
> ++
> +In this example the subject lines of the commits will be folded after
> +78 characters and 'git am' will keep this folding.

You are using "format-patch -k | am -k". Surely that should preserve your subject, no matter the length, and the fact that we need to document it is a sign that the behavior is simply wrong.

So I think we should do the following series instead.

  [1/3]: t: test subject handling in format-patch / am pipeline
  [2/3]: mailinfo: always clean up rfc822 header folding
  [3/3]: format-patch: preserve subject newlines with -k

-Peff