From 4a22502a318a65f144b3b6542cc5e711a1811c78 Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 11 Dec 2018 15:01:35 -0500 Subject: [PATCH 1/2] .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 shell logic that reads from these files is sensitive to CRLF line endings, causing a problem when the test suite is run on a Windows machine that converts LF to CRLF. Exclude the files in this folder from this conversion. Signed-off-by: Derrick Stolee --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index acf853e0299463..3738cea7ebe10c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,3 +13,4 @@ /Documentation/gitk.txt conflict-marker-size=32 /Documentation/user-manual.txt conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32 +/t/oid-info/* eol=lf From 4275b8a5812b7108aecfc027fd6ace9b470a7c88 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 12 Dec 2018 13:34:48 +0100 Subject: [PATCH 2/2] t4256: mark support files as LF-only The test t4256-am-format-flowed.sh requires carefully applying a patch after ignoring padding whitespace. This breaks if the file is munged to include CRLF line endings instead of LF. Signed-off-by: Johannes Schindelin Signed-off-by: Derrick Stolee --- t/.gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/t/.gitattributes b/t/.gitattributes index e7acedabe17f03..df05434d32cc1f 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -16,6 +16,7 @@ t[0-9][0-9][0-9][0-9]/* -whitespace /t4135/* eol=lf /t4211/* eol=lf /t4252/* eol=lf +/t4256/1/* eol=lf /t5100/* eol=lf /t5515/* eol=lf /t556x_common eol=lf