aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <raad@teamviewer.com>2017-04-15 00:10:27 +0200
committerMarcel Raad <raad@teamviewer.com>2017-04-17 08:32:13 +0200
commita0576e2f362bc1a1adee22c924ce33710a69559f (patch)
treeadc22686e69d2191166cde1b6bddd2a2b7b06462
parent05c9f42e52d02448664d794cb64a91f36ac39296 (diff)
.gitattributes: force shell scripts to LF
Bash on Linux errors out on CR characters. This makes tests 1221 and 1222 pass on Linux with a CRLF checkout. Ref: https://github.com/curl/curl/pull/1344#issuecomment-289243166 Closes https://github.com/curl/curl/pull/1422
-rw-r--r--.gitattributes1
-rw-r--r--lib/.gitattributes1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index e84adeec3..429f8cde0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@ configure.ac eol=lf
*.m4 eol=lf
*.in eol=lf
*.am eol=lf
+*.sh eol=lf
diff --git a/lib/.gitattributes b/lib/.gitattributes
new file mode 100644
index 000000000..563eba7fd
--- /dev/null
+++ b/lib/.gitattributes
@@ -0,0 +1 @@
+objnames.inc eol=lf