[ovs-dev] [PATCH v2] build: Add gitattribute file to build-aux

Alin Gabriel Serdean aserdean at ovn.org
Thu Jul 19 16:39:42 UTC 2018


The command: `make check-tabs` fails on Windows due to line ending conversions
caused by the following setting: `git config --global core.autocrlf true`
(the whitelist `build-aux/initial-tab-whitelist` becomes a blacklist)

This patch adds a .gittatribute file to build-aux to force LF endings
on Windows.

Signed-off-by: Alin Gabriel Serdean <aserdean at ovn.org>
Co-authored-by: Aaron Conole <aconole at redhat.com>
---
v2: fold in changes Suggested-by: Aaron Conole <aconole at redhat.com>
---
 .gitignore               | 1 -
 Makefile.am              | 1 +
 build-aux/.gitattributes | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 build-aux/.gitattributes

diff --git a/.gitignore b/.gitignore
index 81faf270d..60e7818c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,6 @@
 .libs
 .tmp_versions
 .vagrant
-.gitattributes
 /Makefile
 /Makefile.in
 /aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index e02799a90..fd6620a9b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,6 +199,7 @@ dist-hook-git: distfiles
 	  (cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
 	    LC_ALL=C sort -u > all-distfiles; \
 	  (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
+	    grep -v '\.gitattributes$$' | \
 	    LC_ALL=C sort -u > all-gitfiles; \
 	  LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
 	  if test -s missing-distfiles; then \
diff --git a/build-aux/.gitattributes b/build-aux/.gitattributes
new file mode 100644
index 000000000..fcadb2cf9
--- /dev/null
+++ b/build-aux/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
-- 
2.16.1.windows.1



More information about the dev mailing list