summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2015-02-21 14:25:35 +0100
committerFrancois-Xavier Le Bail <fx.lebail@yahoo.com>2015-02-21 14:25:35 +0100
commit36923fae59b31a64c3b51519ea9d2fc2c9adc148 (patch)
tree508b08bac4dcee084b4fec1d117d4292c0c46cde /.gitattributes
parentf04e49cd8b2f48d980f34f0d54984fccefdf39c1 (diff)
downloadtcpdump-36923fae59b31a64c3b51519ea9d2fc2c9adc148.tar.gz
gitattributes: Update the attributes for tests/*.out
The actual status for good conditions of tests in Windows are: Sources from autocrlf *.out ending sed stuff git true CRLF no git input LF yes git false LF yes archive N/A LF yes We need to have the sed stuff for sources archives. Thus we need that the endings of tests/*.out files be always LF only. We don't want to depend on user config. Thus this changes. Advantage: This config is under version control, it applies to all users. Get rid of legacy config 'core.autocrlf=true'
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index 3c6697b7..3565e20a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
-# manage core stuff for LF normalization
-core.autocrlf=true
-
# Auto detect text files and perform LF normalization
* text=auto
+
+# Normalize line endings to LF on checkin and
+# prevents conversion to CRLF when the file is checked out
+tests/*.out text eol=lf