Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

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

1 files changed, 48 insertions, 0 deletions

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..1df70670
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,48 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.ic text
+*.cc text
+*.cpp text
+*.h text
+*.test text
+*.java text
+
+# These files should be checked out as is
+*.result -text -whitespace
+*.dat -text -whitespace
+
+storage/connect/mysql-test/connect/std_data/*.txt -text
+pcre/testdata/greppatN4 -text
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.frm binary
+*.MYD binary
+*.MYI binary
+*.class binary
+*.jar binary
+
+*.c     diff=cpp
+*.h     diff=cpp
+*.cc    diff=cpp
+*.inl   diff=cpp
+*.cpp   diff=cpp
+*.java  diff=cpp
+
+# Github lists too many languages
+# curl   -H "Accept: application/vnd.github.v3+json"   https://api.github.com/repos/MariaDB/server/languages
+# Their detection is based on https://github.com/github/linguist#overrides so we use some overrides
+zlib/* linguist-vendored
+tests/*.tst linguist-language=SQL
+tests/*.res linguist-language=SQL
+storage/innobase/include/univ.i linguist-language=C
+*.inc linguist-language=MariaDB\ Test
+*.test linguist-language=MariaDB\ Test
+*.result linguist-language=MariaDB\ Test
+*.frm linguist-language=MariaDB\ Table
+*.h.pp linguist-language=C