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-13 Thread Philip Oakley
From: "Junio C Hamano" To: "Ken Tanzer" Sent: Wednesday, November 13, 2013 5:04 PM Ken Tanzer 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

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

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

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

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 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

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 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 > a

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

2013-11-11 Thread Junio C Hamano
Stefan Beller 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 thing to do. > I was us

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 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 transfe

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

2013-11-11 Thread Junio C Hamano
Ken Tanzer 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. Long lines should pro

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

2013-11-10 Thread Ken Tanzer
I originally posted about this to the git-users list (https://groups.google.com/forum/#!topic/git-users/G5D0bldEbTo). If this would normally be expected to work: git add git commit git rm git commit git format-patch HEAD~1 git reset --hard HEAD~1 git am 0001*patch then I'm having a problem wit