On 11.11.2013 20:04, Junio C Hamano wrote: > Ken Tanzer <ken.tanzer@xxxxxxxxx> 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 > probably be OK, but mixed CRLF, CR and LF may be problematic. > > Having said that... > >> I've confirmed with the following test case on three machines, so it >> seems reproducible: >> >> mkdir temp_test_case >> cd temp_test_case >> git init >> # my file. Sorry--couldn't find a saner link! >> wget -O jquery-ui-1.8.custom.min.js >> http://sourceforge.net/p/agency/code/ci/9358ea4dbe8e1540ec0b8bebfc7770f1bf8be0ec/tree/jquery-ui-1.8.custom.min.js?format=raw >> git add jquery-ui-1.8.custom.min.js >> git commit -m 'Adding jquery-ui' >> git rm jquery-ui-1.8.custom.min.js >> git commit -m 'Removing jquery-ui' >> git format-patch HEAD~1 >> git reset --hard HEAD~1 >> git am 0001* > > ... this does not break at all for me. > -- Here it breaks, though it doesn't break when using git am --ignore-whitespace 0001* I do have this global config core.safecrlf=warn regarding line endings. I was using 1.8.5.rc1.17.g0ecd94d Trying to understand the problem, Stefan
Attachment:
signature.asc
Description: OpenPGP digital signature