From: Philip Oakley <philipoakley@iee.org>
Date: Wed, 13 Nov 2013 23:07:54 GMT
Subject: Re: git rm / format-patch / am fails on my file: patch does not apply
Message-ID: <5ABC4D34F41F48E39205914BC8D3DC35@PhilipOakley>
In-Reply-To: <xmqqbo1ofd1s.fsf@gitster.dls.corp.google.com>

From: "Junio C Hamano" <gitster@pobox.com>
To: "Ken Tanzer" <ken.tanzer@gmail.com>
Sent: Wednesday, November 13, 2013 5:04 PM
> Ken Tanzer <ken.tanzer@gmail.com> writes:
>
>>> I am not very much surprised if such a file misbehaves, because the
>>> "format-patch | am" pipeline is designed to be used on patches that
>>> can be transferred in plain-text e-mail safely.  Long lines should
>>> probably be OK, but mixed CRLF, CR and LF may be problematic.
>>
>> I'm not sure I understand this comment.  format-patch seems to work
>> fine on binary files.
>
> Yes.
>
> The problematic is when you tell it to process text files, taking
> into account various common text breakages may be introduced to the
> payload, and line-end conversion is among the operations that the
> user may be telling it to munge the perfectly-fine input, in an
> attempt to compensate.
>

>> Stefan Beller <stefanbeller@googlemail.com> writes:
>>
>>> I do have this global config
>>>  core.safecrlf=warn
>>> regarding line endings.

Ken,

Do you have one of these line ending conversion settings active in your 
config file?

It sounds like the 'git am' script may be silencing the warnings too 
aggressively if that is the case.

Philip