Skip to content

Commit 614f4f0

Browse files
dschogitster
authored andcommitted
Fix the remaining tests that failed with core.autocrlf=true
The test suite is mainly developed on Linux and MacOSX, which is the reason that nobody thought to mark files as LF-only as needed. The symptom is a test suite that fails left and right when being checked out using Git for Windows (which defaults to core.autocrlf=true). Mostly, the problems stem from Git's (LF-only) output being compared to hard-coded files that are checked out with line endings according to core.autocrlf (which is of course incorrect). This includes the two test files in t/diff-lib/, README and COPYING. This patch can be validated even on Linux by using this cadence: git config core.autocrlf true rm .git/index && git stash make -j15 DEVELOPER=1 test Signed-off-by: Johannes Schindelin <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8a7f8be commit 614f4f0

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

t/.gitattributes

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,21 @@
11
t[0-9][0-9][0-9][0-9]/* -whitespace
2-
t0110/url-* binary
2+
/diff-lib/* eol=lf
3+
/t0110/url-* binary
4+
/t3900/*.txt eol=lf
5+
/t3901/*.txt eol=lf
6+
/t4034/*/* eol=lf
7+
/t4013/* eol=lf
8+
/t4018/* eol=lf
9+
/t4100/* eol=lf
10+
/t4101/* eol=lf
11+
/t4109/* eol=lf
12+
/t4110/* eol=lf
13+
/t4135/* eol=lf
14+
/t4211/* eol=lf
15+
/t4252/* eol=lf
16+
/t5100/* eol=lf
17+
/t5515/* eol=lf
18+
/t556x_common eol=lf
19+
/t7500/* eol=lf
20+
/t8005/*.txt eol=lf
21+
/t9*/*.dump eol=lf

0 commit comments

Comments
 (0)