aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Maxime Dénès <mail@maximedenes.fr>2017-11-23 10:25:14 +0100
committerGravatar Maxime Dénès <mail@maximedenes.fr>2017-11-23 10:25:14 +0100
commit6f8aabaed476c2d47f3ed7c3eccd0e77295d5465 (patch)
tree6260faca7fd6a8b79ebe26bcb2cf227cbe3de890
parent4244f881b07bc6865d61bc75a65b963888c37069 (diff)
parent72a8de79eea1aaaa65fd9139c2cb21f77a7e1735 (diff)
Merge PR #6189: Disable whitespace linter for .out files.
-rw-r--r--.gitattributes2
-rwxr-xr-xdev/tools/should-check-whitespace.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes
index f2c096f2d..51fa208a7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,6 +2,8 @@
.gitignore export-ignore
.mailmap export-ignore
+*.out -whitespace
+
*.asciidoc whitespace=trailing-space,tab-in-indent
*.bat whitespace=cr-at-eol,trailing-space,tab-in-indent
*.bib whitespace=trailing-space,tab-in-indent
diff --git a/dev/tools/should-check-whitespace.sh b/dev/tools/should-check-whitespace.sh
index 8159506b4..190511d95 100755
--- a/dev/tools/should-check-whitespace.sh
+++ b/dev/tools/should-check-whitespace.sh
@@ -2,4 +2,4 @@
# determine if a file has whitespace checking enabled in .gitattributes
-git check-attr whitespace -- "$1" | grep -q -v 'unspecified$'
+git check-attr whitespace -- "$1" | grep -q -v -e 'unset$' -e 'unspecified$'