From: Ken Tanzer <ken.tanzer@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>
Subject: Re: git rm / format-patch / am fails on my file: patch does not apply
Date: Tue, 12 Nov 2013 16:26:49 -0800 [thread overview]
Message-ID: <CAD3a31UVkNaPTCWCAbv0NwCOTE5_2A+P7-e28VRnk9Aopa6hcQ@mail.gmail.com> (raw)
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:
> 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.
next prev parent reply other threads:[~2013-11-13 0:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-11 2:39 git rm / format-patch / am fails on my file: patch does not apply Ken Tanzer
2013-11-11 19:04 ` Junio C Hamano
2013-11-11 19:15 ` Stefan Beller
2013-11-11 19:37 ` Junio C Hamano
2013-11-11 19:43 ` Stefan Beller
2013-11-11 20:39 ` Stefan Beller
2013-11-13 0:26 ` Ken Tanzer [this message]
2013-11-13 17:04 ` Junio C Hamano
2013-11-13 23:12 ` Philip Oakley
2013-11-14 7:26 ` Ken Tanzer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAD3a31UVkNaPTCWCAbv0NwCOTE5_2A+P7-e28VRnk9Aopa6hcQ@mail.gmail.com \
--to=ken.tanzer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).