Re: git-am doesn't strip CRLF line endings when the mbox is base64-encoded
- From
- George Dunlap <george.dunlap@citrix.com>
- Date
- Jan 6, 2020, 11:58 UTC
- Message-ID
- <0c18df58-9d1d-550f-d69e-d6ffe6c01858@citrix.com>
- In-Reply-To
- <dece7350-7b58-bf19-9fdf-4ccf8df268fb@citrix.com>
On 12/18/19 12:15 PM, George Dunlap wrote:
Show 17 quoted lines
> On 12/18/19 11:42 AM, George Dunlap wrote: >> Using git 2.24.0 from Debian testing. >> >> It seems that git-am will strip CRLF endings from mails before applying >> patches when the mail isn't encoded in any way. It will also decode >> base64-encoded mails. But it won't strip CRLF endings from >> base64-encoded mails. >> >> Attached are two mbox files for two different recent series. >> plainenc.am applies cleanly with `git am`, while base64enc.am doesn't. >> >> Poking around the man pages, it looks like part of the issue might be >> that the CRLF stripping is done in `git mailsplit`, before the base64 >> encoding, rather than after. > > Poking around -- it looks like the CRLF stripping would be better done > in `git mailinfo` after the decoding.
Anyone want to take this up? I mean, I could try to send a patch, but since I've never looked at the git source code before, I'm sure it would take me about 10x as much effort for me to do it as for someone already familiar with the codebase.
(And I've already done that work for stackgit: https://github.com/ctmarinas/stgit/pull/46)
-George