Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-13 Thread Junio C Hamano
Ken Tanzer ken.tan...@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

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-13 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com To: Ken Tanzer ken.tan...@gmail.com Sent: Wednesday, November 13, 2013 5:04 PM Ken Tanzer ken.tan...@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

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-13 Thread Ken Tanzer
Hi Philip. I don't have any setting like that in either my ~/.gitconfig, or in the .git/config files. I really haven't tweaked my git config at all. This is a typical .git/config file: [core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true [remote origin] url =

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-12 Thread Ken Tanzer
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

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Junio C Hamano
Ken Tanzer ken.tan...@gmail.com writes: ASCII text, with very long lines, with CRLF, CR, LF line terminators 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.

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:04, Junio C Hamano wrote: Ken Tanzer ken.tan...@gmail.com writes: ASCII text, with very long lines, with CRLF, CR, LF line terminators 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

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed, that would immediately violate safecrlf, so failing the application sounds like the right

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:37, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed, that would immediately violate safecrlf,

Re: git rm / format-patch / am fails on my file: patch does not apply

2013-11-11 Thread Stefan Beller
On 11.11.2013 20:43, Stefan Beller wrote: On 11.11.2013 20:37, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: I do have this global config core.safecrlf=warn regarding line endings. Oh, that sounds very suspicious. If the payload has CRLF, CR and LF mixed,