]> git.proxmox.com Git - ovs.git/commitdiff
build: Add gitattribute file to build-aux
authorAlin Gabriel Serdean <aserdean@ovn.org>
Thu, 19 Jul 2018 16:39:42 +0000 (19:39 +0300)
committerAlin Gabriel Serdean <aserdean@ovn.org>
Thu, 19 Jul 2018 18:02:33 +0000 (21:02 +0300)
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@ovn.org>
Co-authored-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
Acked-by: Ben Pfaff <blp@ovn.org>
.gitignore
Makefile.am
build-aux/.gitattributes [new file with mode: 0644]

index 81faf270d794623f32432d191087b46ca02daa08..60e7818c3cab868a992c366f338968cb28bd6fe2 100644 (file)
@@ -31,7 +31,6 @@
 .libs
 .tmp_versions
 .vagrant
-.gitattributes
 /Makefile
 /Makefile.in
 /aclocal.m4
index e02799a90faba86f585ad923f261fb8a00e9d1d6..fd6620a9b82d403d68420cff3572ecf9ed1faf9a 100644 (file)
@@ -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 (file)
index 0000000..fcadb2c
--- /dev/null
@@ -0,0 +1 @@
+* text eol=lf