From: Jeff King <peff@peff.net>
Date: Tue, 24 May 2011 20:07:16 GMT
Subject: Re: commit a1f6baa5 (wrap long header lines) breaks my habit
Message-ID: <20110524200716.GF584@sigill.intra.peff.net>
In-Reply-To: <20110524164616.GB7723@scotty.home>

On Tue, May 24, 2011 at 06:46:16PM +0200, Stefan-W. Hahn wrote:

> Mail von Junio C Hamano, Tue, 24 May 2011 at 09:27:46 -0700:
> 
> > >    git format-patch -k --stdout a..b | git am -k -3
> > 
> > Why -k to am?
> 
> Just first "-k", and "git am -3". Wrong in mind here at home before my
> computer.

Then it should preserve your long subject line just fine, as mailsplit
(called by "am") will reassemble the folded line according to rfc822
header folding rules.

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
subject. We should probably stop doing that now that we fold on length
(and should probably embed newlines via rfc2047 encoding in
format-patch, at least with "-k", so that you can losslessly move
multi-line subjects between the two if you always use "-k").

-Peff