Re: [PATCH v2 7/7] t4051: mark supporting files as requiring LF-only line endings
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 8, 2017, 05:29 UTC
- Message-ID
- <xmqqefvz9asb.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <f648bb03c7fe3945042480f05b9ac229350412b3.1493891336.git.johannes.schindelin@gmx.de>
Johannes Schindelin <johannes.schindelin@gmx.de> writes:
Show 8 quoted lines
> 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.
Ahem.
I thought that according to your claim a UNIX tool like "grep" would alway use LF endings? ;-)
> 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.
I agree with this conclusion; just like we do not want to worry about how `grep` works when given CRLF files in this patch, we do not want to worry about how other commands like `sh` works when given CRLF files. And that is consistent with the overall theme of this series that marked *.sh, *.perl and other files with eol=lf attribute.
The only question I still have with this series is about the README/COPYING thing. I _think_ it was my ancient mistake to use the toplevel README and COPYING as test files, and that mistake was corrected by somebody else earlier by having a frozen copy in t/diff-lib/ and making tests use these files from that directory. If we broke our tests to again use these files from outside t/diff-lib/, then we would need to fix the tests not to do so. And if we are only looking at t/diff-lib/ copy, then I think it is more consistent with the rest of this series to mark them with eol=lf rather than passing them through "tr -d '\015'".
Thanks.
Show 19 quoted lines
> > Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > t/.gitattributes | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/t/.gitattributes b/t/.gitattributes > index 3525ca43f30..bdd82cf31f7 100644 > --- a/t/.gitattributes > +++ b/t/.gitattributes > @@ -5,6 +5,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