Adding upstream version 15.4.upstream/15.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 31 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..4e4e26e
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,31 @@
+*		whitespace=space-before-tab,trailing-space
+*.[chly]	whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
+*.pl		whitespace=space-before-tab,trailing-space,tabwidth=4
+*.pm		whitespace=space-before-tab,trailing-space,tabwidth=4
+*.po		whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
+*.sgml		whitespace=space-before-tab,trailing-space,tab-in-indent
+*.x[ms]l	whitespace=space-before-tab,trailing-space,tab-in-indent
+
+# Avoid confusing ASCII underlines with leftover merge conflict markers
+README		conflict-marker-size=32
+README.*	conflict-marker-size=32
+
+# Certain data files that contain special whitespace, and other special cases
+*.data						-whitespace
+contrib/pgcrypto/sql/pgp-armor.sql		whitespace=-blank-at-eol
+src/backend/catalog/sql_features.txt		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
+src/backend/utils/Gen_dummy_probes.pl.prolog	whitespace=-blank-at-eof
+
+# Test output files that contain extra whitespace
+*.out					-whitespace
+src/interfaces/ecpg/test/expected/*	-whitespace
+src/interfaces/libpq/test/expected.out	whitespace=-blank-at-eof
+
+# These files are maintained or generated elsewhere.  We take them as is.
+configure				-whitespace
+ppport.h				-whitespace
+src/backend/regex/COPYRIGHT		-whitespace
+src/backend/snowball/libstemmer/*.c	-whitespace
+src/backend/utils/mb/Unicode/*-std.txt	-whitespace
+src/include/snowball/libstemmer/*	-whitespace
+src/timezone/data/*			-whitespace