From: Nanako Shiraishi Date: Fri, 19 Jun 2009 10:42:53 +0000 (+0900) Subject: .gitattributes: CR at the end of the line is an error X-Git-Tag: v1.6.3.3~8 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2f6331a14213f01a6e68e71ed63c77323a3e759;p=git.git .gitattributes: CR at the end of the line is an error When a CR is accidentally added at the end of a C source file in the git project tree, "git diff --check" doesn't detect it as an error. $ echo abQ | tr Q '\015' >>fast-import.c $ git diff --check I think this is because the "whitespace" attribute is set to *.[ch] files without specifying what kind of errors are caught. It makes git "notice all types of errors" (as described in the documentation), but I think it is incorrectly setting cr-at-eol, too, and hides this error. Signed-off-by: Nanako Shiraishi Signed-off-by: Junio C Hamano --- diff --git a/.gitattributes b/.gitattributes index 6b9c715d2..0636deea9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ * whitespace=!indent,trail,space -*.[ch] whitespace +*.[ch] whitespace=indent,trail,space