diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-05-09 14:54:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-10 13:32:51 +0900 |
| commit | 2779f665054c3ba85c1ee298929e640149d84b1e (patch) | |
| tree | 5e8621b324fbc1d4121de6a345158a570e4d9aa2 | |
| parent | 614f4f0f350aef57473b0311b0a36b13e91e1310 (diff) | |
| download | git-js/eol-on-ourselves.tar.gz | |
t4051: mark supporting files as requiring LF-only line endingsjs/eol-on-ourselves
The test t4051-diff-function-context.sh passes on Linux when
core.autocrlf=true even without marking its support files as LF-only,
but they fail when core.autocrlf=true in Git for Windows' SDK.
The reason is that `grep ... >file.c.new` will keep CR/LF line endings
on Linux (obviously treating CRs as if they were regular characters),
but will be converted to LF-only line endings with MSYS2's grep that is
used in Git for Windows.
As we do not want to validate the way the available `grep` works, let's
just mark the input as LF-only and move on.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/.gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/.gitattributes b/t/.gitattributes index 11e5fe3728..3bd959ae52 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -6,6 +6,7 @@ t[0-9][0-9][0-9][0-9]/* -whitespace /t4034/*/* eol=lf /t4013/* eol=lf /t4018/* eol=lf +/t4051/* eol=lf /t4100/* eol=lf /t4101/* eol=lf /t4109/* eol=lf |