Git development
 help / color / mirror / Atom feed
From: "Philip Oakley" <philipoakley@iee.org>
To: "Ken Tanzer" <ken.tanzer@gmail.com>
Cc: <git@vger.kernel.org>, "Junio C Hamano" <gitster@pobox.com>
Subject: Re: git rm / format-patch / am fails on my file: patch does not apply
Date: Wed, 13 Nov 2013 23:12:32 -0000	[thread overview]
Message-ID: <5ABC4D34F41F48E39205914BC8D3DC35@PhilipOakley> (raw)
In-Reply-To: xmqqbo1ofd1s.fsf@gitster.dls.corp.google.com

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 

  reply	other threads:[~2013-11-13 23:12 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
2013-11-13 17:04     ` Junio C Hamano
2013-11-13 23:12       ` Philip Oakley [this message]
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=5ABC4D34F41F48E39205914BC8D3DC35@PhilipOakley \
    --to=philipoakley@iee.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ken.tanzer@gmail.com \
    /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