Re: Is git am supposed to decode MIME?

From

FWFlorian Weimer <fweimer@redhat.com>

Date

Oct 12, 2017, 13:20 UTC

Message-ID

<39aebcbd-7820-eafe-3c44-b96b057d0059@redhat.com>

In-Reply-To

<20171004092546.vnjddxqwvia5cfn6@sigill.intra.peff.net>

On 10/04/2017 11:25 AM, Jeff King wrote:

> On Wed, Oct 04, 2017 at 10:44:31AM +0200, Florian Weimer wrote:
> 
>> The git am documentation talks about “mailboxes”.  I suppose these contain
>> messages in Internet Mail syntax.  Is git am supposed to decode MIME?
>>
>> I'm asking because I have a message whose body is encoded as
>> quoted-printable, but git am does not parse the patch contained in it.
>>
>> If git am is supposed to deal with this, I'll dig deeper and try to figure
>> out where things go wrong.
> 
> Yes, it should. I just double-checked with the toy patch patch below,
> and it correctly extracted the quoted-printable from the commit message
> and patch, as well as in the headers.

@@ -5137,11 +5114,13 @@ __libc_mallopt (int param_number, int value)
    if (__malloc_initialized < 0)
      ptmalloc_init ();
    __libc_lock_lock (av->mutex);
-  /* Ensure initialization/consolidation */
-  malloc_consolidate (av);
=20
    LIBC_PROBE (memory_mallopt, 2, param_number, value);
=20
+  /* We must consolidate main arena before changing max_fast
+     (see definition of set_max_fast).  */
+  malloc_consolidate (av);
+
    switch (param_number)
      {
      case M_MXFAST:=

The “=” masks the final newline, and that doesn't decode into a valid 
diff hunk.  The file being patched continues after that, so it's not 
even the “\ No newline at end of file” case.

So in short, there is no Git bug here, and I just failed to interpret 
the “git am” diagnostics correctly:

Applying: Improve malloc initialization sequence
error: corrupt patch at line 342
Patch failed at 0001 Improve malloc initialization sequence
The copy of the patch that failed is found in: .git/rebase-apply/patch

Line 342 refers to the file in .git/rebase-apply/patch, not the original 
input, and it took me a while to figure that out.

Thanks,
Florian