From: Jeff King <peff@peff.net>
To: Mason <slash.tmp@free.fr>
Cc: git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: Quoted-printable support in git am
Date: Thu, 5 Oct 2017 05:30:53 -0400 [thread overview]
Message-ID: <20171005093052.3uefgby6a57udoqy@sigill.intra.peff.net> (raw)
In-Reply-To: <165c9648-e7f0-66de-b3b9-023c48c49d95@free.fr>
On Thu, Oct 05, 2017 at 11:15:08AM +0200, Mason wrote:
> Is there a magic option I should be passing to git am?
No, it's supposed to work out of the box.
> The patch header contains:
>
> Content-Type: text/plain; charset=UTF-8; format=flowed
> Content-Transfer-Encoding: quoted-printable
That looks right. Though I wouldn't be surprised if whatever generated
the "flowed" also screwed up patch whitespace.
> The drivers/media/rc/Kconfig:469 part is
>
> --- a/drivers/media/rc/Kconfig
> +++ b/drivers/media/rc/Kconfig
> @@ -469,6 +469,11 @@ config IR_SIR
> =09 To compile this driver as a module, choose M here: the module will
> =09 be called sir-ir.
> =20
> +config IR_TANGO
> +=09tristate "Sigma Designs SMP86xx IR decoder"
> +=09depends on RC_CORE
> +=09depends on ARCH_TANGO || COMPILE_TEST
> +
> config IR_ZX
> =09tristate "ZTE ZX IR remote control"
> =09depends on RC_CORE
After "git am" bails, what does .git/rebase-apply/patch look like?
It should have the quoted-printable bits decoded. If it doesn't, then we
need to figure out why the qp-decoding didn't kick in. It would help to
see the whole input mbox then.
If it does have the qp bits decoded, then I'd suspect that maybe there's
whitespace damage caused by the MUA.
-Peff
next prev parent reply other threads:[~2017-10-05 9:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-05 9:15 Quoted-printable support in git am Mason
2017-10-05 9:30 ` Jeff King [this message]
2017-10-05 9:43 ` Junio C Hamano
2017-10-05 11:58 ` Mason
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=20171005093052.3uefgby6a57udoqy@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=slash.tmp@free.fr \
/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).