Le 21.06.2013 23:57, Junio C Hamano a écrit :
Junio C Hamano <gits...@pobox.com> 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
fatal: CRLF would be replaced by LF in test.

# git version (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 <ydrone...@opteya.com>


Yann Droneaud

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to