diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2009-06-19 19:42:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 10:42:37 -0700 |
| commit | e2f6331a14213f01a6e68e71ed63c77323a3e759 (patch) | |
| tree | 8aa1b4bda0f53624432435c2e5e3c0177a3a7935 | |
| parent | c6720cfa49fde6d78b010c088a476d226d161983 (diff) | |
| download | git-e2f6331a14213f01a6e68e71ed63c77323a3e759.tar.gz git-e2f6331a14213f01a6e68e71ed63c77323a3e759.tar.xz | |
.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 <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
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 |