summaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorMukilan Thiagarajan <mukilanthiagarajan@gmail.com>2013-08-24 22:20:20 +0530
committerMukilan Thiagarajan <mukilanthiagarajan@gmail.com>2013-08-24 22:20:20 +0530
commitdad2ccc9b3b27d3f438eeea53b771cc85f6dfa32 (patch)
tree7c0557e75f1fe6b705542a4a90ca2adbddf89943 /.gitattributes
parentauto merge of #8732 : kballard/rust/str-truncate, r=thestinger (diff)
downloadgrust-dad2ccc9b3b27d3f438eeea53b771cc85f6dfa32.tar.gz
grust-dad2ccc9b3b27d3f438eeea53b771cc85f6dfa32.tar.bz2
grust-dad2ccc9b3b27d3f438eeea53b771cc85f6dfa32.tar.xz
Force line ending of '.in' files in jemalloc to LF
This fixes issue #8731 . On Windows, if the git option core.autocrlf is true (github recommends users to turn on this flag - see https://help.github.com/articles/dealing-with-line-endings), the headers generated from the .in files will have syntatic errors, causing compilation to fail.
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 22d42a82a3..10505d47e6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,6 @@ src/rt/msvc/* -whitespace
8src/rt/vg/* -whitespace 8src/rt/vg/* -whitespace
9src/rt/linenoise/* -whitespace 9src/rt/linenoise/* -whitespace
10src/rt/jemalloc/**/* -whitespace 10src/rt/jemalloc/**/* -whitespace
11src/rt/jemalloc/include/jemalloc/jemalloc.h.in text eol=lf
12src/rt/jemalloc/include/jemalloc/jemalloc_defs.h.in text eol=lf
13src/rt/jemalloc/include/jemalloc/internal/jemalloc_internal.h.in text eol=lf