From: Yann Droneaud Date: Mon, 24 Jun 2013 12:42:12 GMT Subject: Re: git diff returns fatal error with core.safecrlf is set to true. Message-ID: In-Reply-To: <7vip17ktyz.fsf@alter.siamese.dyndns.org> Hi, Le 21.06.2013 23:57, Junio C Hamano a écrit : > Junio C Hamano writes: > >> The helper may want to learn a way to be told to demote that error >> to a warning. > > Perhaps something like this? > Thanks for the patch. I run my test again, eg. run git diff after a rebase failure (see my other mail about core.safecrlf), I'm able to run git diff a get a meaningful output: # git version 1.8.1.4 fatal: CRLF would be replaced by LF in test. # git version 1.8.3.1.741.g635527f.dirty (eg. next + your patch) warning: CRLF will be replaced by LF in test. The file will have its original line endings in your working directory. diff --git a/test b/test index b043836..63ba10f 100644 --- a/test +++ b/test @@ -1,4 +1,4 @@ -Hello World 1 -Hello World 2 -Hello World 3 +Hello World 1 +Hello World 2 +Hello World 3 Hello World 4 \ No newline at end of file It seems better. The removed lines have CRLF EOL while the added line have LF line ending characters. Tested-By: Yann Droneaud Regards. -- Yann Droneaud OPTEYA