Re: git am and CRLF files

From: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
Date: Nov 16, 2009, 11:15 UTC
Message-ID: <4B013460.2030406@atlas-elektronik.com>
In-Reply-To: <20091116195036.6117@nanako3.lavabit.com>

On 11/16/2009 11:50 AM, Nanako Shiraishi wrote:

Show 26 quoted lines

> Quoting Stefan Naewe <stefan.naewe@atlas-elektronik.com>
> 
>>> A repository with some UNIX (LF) and some Windows (CRLF) files.
>>> (and no: I will not change the files. My editors handle CRLF and LF correctly)
>>>
>>> My problem:
>>>
>>> 'git am' can't handle changes in CRLF files because the patch
>>> gets converted (by git mailsplit) to contain only LF.
>>> Stefan
>> Does anyone have any comment on this ?
> 
> This was done very much on purpose.
> 
> The "am" command is meant to handle e-mailed patches, and traditionally
> mails are known to clobber carriage returns.
> 
> See commit c2ca1d79dbd54b06a05e5d14a897699e59dc9f9f
> 
>     Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
>     
>     It is not that uncommon to have mails with DOS line-ending, notably
>     Thunderbird and web mailers like Gmail (when saving what they call
>     "original" message).  So modify mailsplit to convert CRLF line-endings to
>     just LF.
>

I've noticed that. But converting everything just breaks git am for CRLF files, doesn't it ? Wouldn't it be possible (and sensible) to not convert the diff text, but only the rest (mail text, headers, etc.) ?

Regards,

Stefan

-- 
----------------------------------------------------------------
/dev/random says: Change is inevitable, except from a vending machine.