summary refs log tree commit
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2018-12-12 10:14:54 -0800
committerJunio C Hamano <gitster@pobox.com>2018-12-13 11:39:45 +0900
commit98f2d930d19c86c3c3d51176616558a73fd3d1de (patch)
tree5ba6c16cc5d3d465e93c45c7a7cf2ab0606a8e1b
parent3aa4d81f88d2f09173e65eebe35a385b2a064c87 (diff)
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 <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/.gitattributes b/t/.gitattributes
index 3bd959ae52..af5ce637b7 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -14,6 +14,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