summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2017-08-23 17:21:36 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2017-08-23 17:30:00 (GMT)
commitb85c2589a1a22fb46620d7b0fd8aa6ec28ac5670 (patch)
tree1c2ba618abfde033d013bd4734f82456ea55b7aa
parent377f3685fc0f3af67829c808b791d0db72f377a6 (diff)
downloadCMake-b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670.zip
CMake-b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670.tar.gz
CMake-b85c2589a1a22fb46620d7b0fd8aa6ec28ac5670.tar.bz2
gitattributes: prefer `-text` for binary files
-rw-r--r--.gitattributes5
-rw-r--r--Tests/Module/ExternalData/.gitattributes5
-rw-r--r--Tests/Module/ExternalData/MD5/.gitattributes1
-rw-r--r--Tests/Module/ExternalData/SHA1/.gitattributes1
-rw-r--r--Tests/Module/ExternalData/SHA224/.gitattributes1
-rw-r--r--Tests/Module/ExternalData/SHA256/.gitattributes1
-rw-r--r--Tests/Module/ExternalData/SHA3_256/.gitattributes1
7 files changed, 8 insertions, 7 deletions
diff --git a/.gitattributes b/.gitattributes
index e43ccbb..14aa49e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -16,11 +16,12 @@ configure crlf=input
*.bat -crlf
*.bat.in -crlf
-*.pfx -crlf
-*.png -crlf
*.sln -crlf
*.vcproj -crlf
+*.pfx -text
+*.png -text
+
*.c our-c-style
*.cc our-c-style
*.cpp our-c-style
diff --git a/Tests/Module/ExternalData/.gitattributes b/Tests/Module/ExternalData/.gitattributes
new file mode 100644
index 0000000..516129b
--- /dev/null
+++ b/Tests/Module/ExternalData/.gitattributes
@@ -0,0 +1,5 @@
+MD5/* -text
+SHA1/* -text
+SHA224/* -text
+SHA256/* -text
+SHA3_256/* -text
diff --git a/Tests/Module/ExternalData/MD5/.gitattributes b/Tests/Module/ExternalData/MD5/.gitattributes
deleted file mode 100644
index 3e51d39..0000000
--- a/Tests/Module/ExternalData/MD5/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf
diff --git a/Tests/Module/ExternalData/SHA1/.gitattributes b/Tests/Module/ExternalData/SHA1/.gitattributes
deleted file mode 100644
index 3e51d39..0000000
--- a/Tests/Module/ExternalData/SHA1/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf
diff --git a/Tests/Module/ExternalData/SHA224/.gitattributes b/Tests/Module/ExternalData/SHA224/.gitattributes
deleted file mode 100644
index 3e51d39..0000000
--- a/Tests/Module/ExternalData/SHA224/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf
diff --git a/Tests/Module/ExternalData/SHA256/.gitattributes b/Tests/Module/ExternalData/SHA256/.gitattributes
deleted file mode 100644
index 3e51d39..0000000
--- a/Tests/Module/ExternalData/SHA256/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf
diff --git a/Tests/Module/ExternalData/SHA3_256/.gitattributes b/Tests/Module/ExternalData/SHA3_256/.gitattributes
deleted file mode 100644
index 3e51d39..0000000
--- a/Tests/Module/ExternalData/SHA3_256/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-* -crlf