At 12:11 -0700 27 Jun 2018, Junio C Hamano <gitster@xxxxxxxxx> wrote:
Hmph. Do other people have difficulty applying this patch to their trees? It is just several lines long so I could retype it myself, but I guess "Content-Type: text/plain; charset=utf-8; format=flowed" has destroyed formatting of the patch rather badly.
Yes, format=flowed requires lines that start with a space (along with '>' or 'From ') to be space-stuffed, adding a leading space. This will affect context lines in patches.
I was able to apply it cleanly (I think) by sending the message to:
sed '/@@/,$s/^ / /' | git am That's replacing two leading spaces with one.
