aboutsummaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2013-11-12 21:58:46 -0500
committerPeter Eisentraut <peter_e@gmx.net>2013-11-12 21:58:46 -0500
commitc0764a542530c7ebf8abd2766d256d49d27e90e8 (patch)
tree70ff3686fcf1d7530baf27d5e866a50a89f3fa5b /.gitattributes
parent061b88c732952c59741374806e1e41c1ec845d50 (diff)
downloadpostgresql-c0764a542530c7ebf8abd2766d256d49d27e90e8.tar.gz
postgresql-c0764a542530c7ebf8abd2766d256d49d27e90e8.zip
gitattributes: Make syntax compatible with older Git versions
Avoid the use of **, which was only introduced in Git version 1.8.2.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 7d1d16416e9..a13116aaf64 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,15 +12,16 @@ README conflict-marker-size=32
README.* conflict-marker-size=32
# Certain data files that contain special whitespace, and other special cases
-**/data/*.data -whitespace
+*.data -whitespace
contrib/tsearch2/sql/tsearch2.sql whitespace=space-before-tab,blank-at-eof,-blank-at-eol
doc/bug.template whitespace=space-before-tab,-blank-at-eof,blank-at-eol
src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-blank-at-eol
src/backend/tsearch/hunspell_sample.affix whitespace=-blank-at-eof
# Test output files that contain extra whitespace
-**/expected/*.out -whitespace
-**/output/*.source -whitespace
+*.out -whitespace
+contrib/*/output/*.source -whitespace
+src/test/regress/output/*.source -whitespace
src/interfaces/ecpg/test/expected/* -whitespace
src/interfaces/libpq/test/expected.out whitespace=-blank-at-eof