list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <>
To: Yann Droneaud <>
Cc: <>
Subject: Re: git diff returns fatal error with core.safecrlf is set to true.
Date: Fri, 21 Jun 2013 08:44:15 -0700	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <> (Yann Droneaud's message of "Fri, 21 Jun 2013 15:26:51 +0200")

Yann Droneaud <> writes:

> While testing the behavor of Git regarding CRLF handling,
> when core.safecrlf is set to true, I've found that "git diff" is
> returning
> "fatal: CRLF would be replaced by LF" without returning any kind of
> diff.
> This make me wonder if its the correct behavor for git diff to (only)
> fail:
> It should be fatal for git add / git commit ( / git cherry-pick /
> ... ?),
> but non fatal for git diff.

Yeah, I agree.

This is a diff between something and the working tree file, right?
It needs to convert from the working tree representation to the
canonical repository representation before doing the actual
comparison, and most likely the same helper function that is reused
for the check-in codepath, which needs to error out, is erroring out
after finding an input in your working tree that cannot safely
round-trip between LF/CRLF world.

The helper may want to learn a way to be told to demote that error
to a warning.

  reply	other threads:[~2013-06-21 15:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-21 13:26 Yann Droneaud
2013-06-21 15:44 ` Junio C Hamano [this message]
2013-06-21 21:57   ` Junio C Hamano
2013-06-24 12:42     ` Yann Droneaud
2013-06-24 18:19       ` Junio C Hamano
2013-06-24 21:48         ` Junio C Hamano
2013-06-25 20:29           ` Torsten Bögershausen
2013-06-26 15:48             ` Junio C Hamano

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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.
Code repositories for project(s) associated with this inbox:

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 read-only IMAP folder(s) and NNTP newsgroup(s).