From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <stefanbeller@googlemail.com>
Cc: Ken Tanzer <ken.tanzer@gmail.com>,
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: Mon, 11 Nov 2013 11:37:02 -0800 [thread overview]
Message-ID: <xmqqd2m6logx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <52812CC0.5050805@googlemail.com> (Stefan Beller's message of "Mon, 11 Nov 2013 20:15:12 +0100")
Stefan Beller <stefanbeller@googlemail.com> writes:
> I do have this global config
> core.safecrlf=warn
> regarding line endings.
Oh, that sounds very suspicious. If the payload has CRLF, CR and LF
mixed, that would immediately violate safecrlf, so failing the
application sounds like the right thing to do.
> I was using 1.8.5.rc1.17.g0ecd94d
>
> Trying to understand the problem,
Likewise. Thanks for chiming in.
next prev parent reply other threads:[~2013-11-11 19:37 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 [this message]
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
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=xmqqd2m6logx.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ken.tanzer@gmail.com \
--cc=philipoakley@iee.org \
--cc=stefanbeller@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.