Skip to content

Commit 0084e4b

Browse files
committed
gitattributes: mark test21.ok binary, drop test42.in
This change does 2 things: 1) Mark src/testdir/test21.ok as binary by git. After 0ed8ba3, test21.ok was treated by Git as a text file using LF line endings. However, the test explicitly checks handling of files with mixed line endings, so it must retain its literal LF and CR endings and must not be modified by Git. Therefore, mark it explicitly as binary. 2) Remove src/testdir/test42.in This test was converted to the new-style test in v8.2.1316 and was therefore deleted. There is no need to keep gitattributes rules for a non-existing file. related: #19086 Signed-off-by: Christian Brabandt <[email protected]>
1 parent 536ee91 commit 0084e4b

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

.gitattributes

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
src/testdir/test42.in diff
2-
31
# The old test .ok files are expected to use LF line endings, even on Windows.
42
# In src/testdir/Make_mvc.mak and src/testdir/Make_ming.mak, the test result
53
# files .out are converted to LF line endings before being compared.
64
# Therefore, if the .ok files' line endings are not specified and are
75
# converted to CRLF, the comparison between .ok and .out will fail.
86
src/testdir/test*.ok text eol=lf
97

8+
# This ok file contains literal CR LF endings. Should not be touched by git,
9+
# so handle as binary
10+
src/testdir/test21.ok -text
11+
1012
# `vim.pot` is updated every time any of the *.c files are modified. And as it
1113
# contains line numbers for strings from *.c files, inserting a line into a
1214
# single .c file may cause many lines in the `vim.pot` file to be updated.

0 commit comments

Comments
 (0)