summary refs log tree commit
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2018-12-11 12:35:46 -0800
committerJunio C Hamano <gitster@pobox.com>2018-12-14 12:53:06 +0900
commitfc767afe77ee0e1bca50d86c8ec1277ea473b1bc (patch)
tree10715d2b3372b9b19fd4efe597665bbd91a8bbdd
parentae0c89d41bbdbcdd53296a8260907105de38e112 (diff)
The new test_oid machinery in the test library requires reading
some information from t/oid-info/hash-info and t/oid-info/oid.

The logic to read from these files in shell uses built-in "read"
command, which leaves CR at the end of these text files when they
are checked out with CRLF line endings, at least when run with bash
shipped with Git for Windows.  This results in an unexpected value
in the variable these lines are read into, leading the tests to
fail.

Mark them to be checked out always with the LF line endings.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 1bdc91e282..4a9e869f02 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,3 +9,4 @@
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf
 /mergetools/* eol=lf
+/t/oid-info/* eol=lf