Re: git rm / format-patch / am fails on my file: patch does not apply
- From
- Ken Tanzer <ken.tanzer@gmail.com>
- Date
- Nov 14, 2013, 07:26 UTC
- Message-ID
- <CAD3a31X_o3cXr10ARiZjMFvG-yzj9hUUpmoLnjDXTjM4nHiD=w@mail.gmail.com>
- In-Reply-To
- <5ABC4D34F41F48E39205914BC8D3DC35@PhilipOakley>
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 = ssh://ktanzer@git.code.sf.net/p/agency/code fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"] remote = origin merge = refs/heads/master
My ~/.gitconfig just has name and email settings in it.
Ken
On Wed, Nov 13, 2013 at 3:12 PM, Philip Oakley <philipoakley@iee.org> wrote:
Show 41 quoted lines
> From: "Junio C Hamano" <gitster@pobox.com> > To: "Ken Tanzer" <ken.tanzer@gmail.com> > Sent: Wednesday, November 13, 2013 5:04 PM > >> Ken Tanzer <ken.tanzer@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 problematic. >>> >>> >>> I'm not sure I understand this comment. format-patch seems to work >>> fine on binary files. >> >> >> Yes. >> >> The problematic is when you tell it to process text files, taking >> into account various common text breakages may be introduced to the >> payload, and line-end conversion is among the operations that the >> user may be telling it to munge the perfectly-fine input, in an >> attempt to compensate. >> > >>> Stefan Beller <stefanbeller@googlemail.com> writes: >>> >>>> I do have this global config >>>> core.safecrlf=warn >>>> regarding line endings. > > > Ken, > > Do you have one of these line ending conversion settings active in your > config file? > > It sounds like the 'git am' script may be silencing the warnings too > aggressively if that is the case. > > Philip
-- 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.