Skip to content

Commit 3c921cc

Browse files
aserdeanapconole
andcommittedJul 19, 2018
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 <[email protected]> Co-authored-by: Aaron Conole <[email protected]> Signed-off-by: Aaron Conole <[email protected]> Acked-by: Ben Pfaff <[email protected]>
1 parent 7c1ccbd commit 3c921cc

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed
 

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
.libs
3232
.tmp_versions
3333
.vagrant
34-
.gitattributes
3534
/Makefile
3635
/Makefile.in
3736
/aclocal.m4

‎Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ dist-hook-git: distfiles
199199
(cat distfiles; sed 's|^|datapath/|' datapath/distfiles) | \
200200
LC_ALL=C sort -u > all-distfiles; \
201201
(cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
202+
grep -v '\.gitattributes$$' | \
202203
LC_ALL=C sort -u > all-gitfiles; \
203204
LC_ALL=C comm -1 -3 all-distfiles all-gitfiles > missing-distfiles; \
204205
if test -s missing-distfiles; then \

‎build-aux/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text eol=lf

0 commit comments

Comments
 (0)
Please sign in to comment.