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

.gitattributes patch | blob | history
diff --git a/.gitattributes b/.gitattributes
index acf853e0299463a12212e9ed5f35d7f4a9d289af..9fa72ad4503031528e24e7c69f24ca92bcc99914 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,6 +9,7 @@
 /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