Mike Crowe [off-list ref] writes:
All the solutions presented so far do cause a small change in behaviour
when using git diff --quiet: they may now cause warning messages like:
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
That is actually a good thing, I think. As the test modifies a file
that originally has "Hello\r\nWorld\r\n" in it to this:
quoted
+test_expect_success 'quiet diff works on file with line-ending change that has no effect on repository' '
+ printf "Hello\r\nWorld\n" >crlf.txt &&
If you did "git add" at this point, you would get the same warning,
because the lack of CR on the second line could well be a mistake
you may want to notice and fix before going forward. Otherwise
you'd be losing information that _might_ matter to you (i.e. the
fact that the first line had CRLF while the second had LF) and it is
the whole point of safe_crlf setting.
I also think it is a good thing if "git status" reported this path
as modified for the same reason (I didn't actually check if that is
the case).
On Thursday 02 March 2017 at 10:33:59 -0800, Junio C Hamano wrote:
Mike Crowe [off-list ref] writes:
quoted
All the solutions presented so far do cause a small change in behaviour
when using git diff --quiet: they may now cause warning messages like:
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
That is actually a good thing, I think. As the test modifies a file
that originally has "Hello\r\nWorld\r\n" in it to this:
quoted
quoted
+test_expect_success 'quiet diff works on file with line-ending change that has no effect on repository' '
+ printf "Hello\r\nWorld\n" >crlf.txt &&
If you did "git add" at this point, you would get the same warning,
because the lack of CR on the second line could well be a mistake
you may want to notice and fix before going forward. Otherwise
you'd be losing information that _might_ matter to you (i.e. the
fact that the first line had CRLF while the second had LF) and it is
the whole point of safe_crlf setting.
Well, there is an argument that it's not very "--quiet" to emit this
message. Especially when it didn't used to come out. However, I can
understand that the message is useful if the line endings have changed
despite this.
However, I can make the message appear from "git diff --quiet" even if the
line endings have not changed. I merely need to touch a file where the line
endings do not match the canonical representation in the repository first.
Upon subsequent invocations of "git diff --quiet" the message does not come
out. (Note that in this may not be reproducible in a script without
sleeps.)
Perhaps this interactive log will make things clearer:
$ git init
Initialized empty Git repository in /tmp/test/.git/
$ echo "* text=auto" >.gitattributes
$ printf "Hello\r\nWorld\r\n" >crlf.txt
$ git add .gitattributes crlf.txt
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
The message was expected and useful there.
$ git commit -m "initial"
[master (root-commit) c3fb5a5] initial
2 files changed, 3 insertions(+)
create mode 100644 .gitattributes
create mode 100644 crlf.txt
$ git diff --quiet
$ touch crlf.txt
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
I didn't change the file - I just touched it. Why did the message come out here?
$ git diff --quiet
But then it didn't here. Which is correct?
$ printf "Hello\r\nWorld\n" >crlf.txt
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
If the line endings have genuinely changed then the message comes out every
time...
$ git add crlf.txt
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
...until the file is added to the index. That's probably the right thing to
do.
$ git diff --quiet
$ touch crlf.txt
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
$ git diff --quiet
But once the file has been added the previous behaviour of only emitting
the message on the first time after the touch occurs.
$ printf "Hello\r\nWorld\n" >crlf.txt
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
$ git diff --quiet
$ printf "Hello\r\nWorld\r\n" >crlf.txt
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
$ git diff --quiet
warning: CRLF will be replaced by LF in crlf.txt.
The file will have its original line endings in your working directory.
Hopefully that makes things a bit clearer.
Mike.
Understood, thanks for the explanation.
quiet is not quite any more..
Does the following fix help ?
--- a/diff.c
+++ b/diff.c
@@ -2826,6 +2826,8 @@ int diff_populate_filespec(struct diff_filespec *s,
unsigned int flags)
enum safe_crlf crlf_warn = (safe_crlf == SAFE_CRLF_FAIL
? SAFE_CRLF_WARN
: safe_crlf);
+ if (size_only)
+ crlf_warn = SAFE_CRLF_FALSE;