From fc767afe77ee0e1bca50d86c8ec1277ea473b1bc Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 11 Dec 2018 12:35:46 -0800 Subject: .gitattributes: ensure t/oid-info/* has eol=lf 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 Signed-off-by: Junio C Hamano --- .gitattributes | 1 + 1 file changed, 1 insertion(+) (limited to '.gitattributes') 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 -- cgit v1.2.3