From 3c921cc2b6b760bd0db73fd629ee9614edc8914c Mon Sep 17 00:00:00 2001 From: Alin Gabriel Serdean Date: Thu, 19 Jul 2018 19:39:42 +0300 Subject: [PATCH] build: Add gitattribute file to build-aux 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 Co-authored-by: Aaron Conole Signed-off-by: Aaron Conole Acked-by: Ben Pfaff --- .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