Andrew's git / gitweb.git / diff
?
Merge branch 'ds/hash-independent-tests-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000 (12:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 15 Dec 2018 03:24:32 +0000 (12:24 +0900)
Test portability fix.

* ds/hash-independent-tests-fix:
.gitattributes: ensure t/oid-info/* has eol=lf

1  2 
.gitattributes patch | diff1 | diff2 | blob | history
diff --combined .gitattributes
index acf853e0299463a12212e9ed5f35d7f4a9d289af,4a9e869f027680639623fd4c382469085f61efd9..9fa72ad4503031528e24e7c69f24ca92bcc99914
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -5,11 -5,8 +5,12 @@@
  *.pl eof=lf diff=perl
  *.pm eol=lf diff=perl
  *.py eol=lf diff=python
 -/Documentation/git-*.txt eol=lf
 +/Documentation/**/*.txt eol=lf
  /command-list.txt eol=lf
  /GIT-VERSION-GEN eol=lf
  /mergetools/* eol=lf
+ /t/oid-info/* eol=lf
 +/Documentation/git-merge.txt conflict-marker-size=32
 +/Documentation/gitk.txt conflict-marker-size=32
 +/Documentation/user-manual.txt conflict-marker-size=32
 +/t/t????-*.sh conflict-marker-size=32