git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git rm / format-patch / am fails on my file: patch does not apply

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 11, 2013, 19:37 UTC
Message-ID
<xmqqd2m6logx.fsf@gitster.dls.corp.google.com>
In-Reply-To
<52812CC0.5050805@googlemail.com>
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.
Previous: Stefan BellerNext: Stefan Beller
Message 4 of 10 in “git rm / format-patch / am fails on my file: patch does not apply”
  1. Ken TanzerNov 11, 2013
  2. Junio C HamanoNov 11, 2013
  3. Stefan BellerNov 11, 2013
  4. Junio C HamanoNov 11, 2013
  5. Stefan BellerNov 11, 2013
  6. Stefan BellerNov 11, 2013
  7. Ken TanzerNov 13, 2013
  8. Junio C HamanoNov 13, 2013
  9. Philip OakleyNov 13, 2013
  10. Ken TanzerNov 14, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.