Re: git rm / format-patch / am fails on my file: patch does not apply
- From
- Ken Tanzer <ken.tanzer@gmail.com>
- Date
- Nov 13, 2013, 00:26 UTC
- Message-ID
- <CAD3a31UVkNaPTCWCAbv0NwCOTE5_2A+P7-e28VRnk9Aopa6hcQ@mail.gmail.com>
- In-Reply-To
- <xmqqhabilpzx.fsf@gitster.dls.corp.google.com>
> 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. So if it can handle any random collection of bytes, why not text files with (admittedly funky) CRs and LFs?
Cheers, Ken
On Mon, Nov 11, 2013 at 11:04 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 29 quoted lines
> Ken Tanzer <ken.tanzer@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. 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.
-- AGENCY Software A data system that puts you in control 100% Free Software http://agency-software.org/ ken.tanzer@agency-software.org (253) 245-3801 Subscribe to the mailing list to learn more about AGENCY or follow the discussion.