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

From

SHStefan-W. Hahn <stefan.hahn@s-hahn.de>

Date

May 25, 2011, 15:40 UTC

Message-ID

<20110525154046.GC7723@scotty.home>

In-Reply-To

<20110524200716.GF584@sigill.intra.peff.net>

Mail von Jeff King, Tue, 24 May 2011 at 16:07:16 -0400:

Hello,

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

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.

Stefan

Perhaps a little clarification like this:

commit e8069848dffe72579aa7f2c542e39fde9eab84b1
Author: Stefan-W. Hahn <stefan.hahn@s-hahn.de>
Date:   Wed May 25 17:33:03 2011 +0200

    format-patch: Clarify the behaviour of '-k'.
    
    Added clarification in documentation of of 'git format-patch'.
    
    When using 'git format-patch' together with 'git am' for rebasing,
    'git am' should be called without '-k' if long subject lines should be
    reassembled. This is neccesary, because a wrapping of long header lines
    was introduced with commit:
    
    commit a1f6baa5c97abc8b579fa7ac7c4dc21971bdc048
    format-patch: wrap long header lines
    
    Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de>

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
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.
++
+To preserve long subject lines, 'git am' will reassemble the folded
+lines according to rfc822 if called without '-k' like this:
++
+------------
+$ git format-patch -k --stdout R1..R2 | git am -3
+------------
 
 * Extract all commits which are in the current branch but not in the
 origin branch:

-- 
Stefan-W. Hahn                          It is easy to make things.
                                        It is hard to make things simple.