From: Jeff King <peff@peff.net>
To: "Stefan-W. Hahn" <stefan.hahn@s-hahn.de>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: commit a1f6baa5 (wrap long header lines) breaks my habit
Date: Tue, 24 May 2011 16:07:16 -0400 [thread overview]
Message-ID: <20110524200716.GF584@sigill.intra.peff.net> (raw)
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
next prev parent reply other threads:[~2011-05-24 20:07 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-24 16:02 commit a1f6baa5 (wrap long header lines) breaks my habit Stefan-W. Hahn
2011-05-24 16:27 ` Junio C Hamano
2011-05-24 16:46 ` Stefan-W. Hahn
2011-05-24 20:07 ` Jeff King [this message]
2011-05-25 15:40 ` Stefan-W. Hahn
2011-05-26 20:36 ` Jeff King
2011-05-26 20:41 ` [PATCH 1/3] t: test subject handling in format-patch / am pipeline Jeff King
2011-05-26 20:53 ` [PATCH 2/3] mailinfo: always clean up rfc822 header folding Jeff King
2011-05-26 20:55 ` [PATCH 3/3] format-patch: preserve subject newlines with -k Jeff King
2011-05-26 21:18 ` Junio C Hamano
2011-05-26 21:19 ` Jeff King
2011-05-26 22:24 ` Jeff King
2011-05-26 22:27 ` [PATCH 3/5] pretty: add pp_commit_easy function for simple callers Jeff King
2011-05-26 22:47 ` Junio C Hamano
2011-05-26 22:27 ` [PATCH 4/5] clean up calling conventions for pretty.c functions Jeff King
2011-05-26 22:28 ` [PATCH 5/5] format-patch: preserve subject newlines with -k Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110524200716.GF584@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stefan.hahn@s-hahn.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).