Always force LF line endings in old test .ok files
Commit:
https://github.com/vim/vim/commit/0ed8ba3079ea5f382e8894c172c3f4f6464e35b6
Author: Muraoka Taro <[email protected]>
Date: Tue Jan 6 10:30:09 2026 +0000
Always force LF line endings in old test .ok files
Problem: When running tests on a source tree checked out with git for
Windows, the old tests fail.
The Git for Windows installer installs git with core.autocrlf=true by
default. If you check out, build, and run tests using such a git, the
old test .ok files will likely fail because they use CRLF line endings.
Tests on Windows assume that .ok files use LF line endings, and
appropriately convert the line endings of related files. This
assumption breaks down when .ok files use CRLF.
Solution: Force LF line endings for old test .ok files in the
.gitattributes file. Related to that, we've stopped explicitly
specifying line endings when checking out in CI, since this is no longer
necessary.
While at it, also fix a typo in the comment of the gitattributes file.
closes: #19086
Signed-off-by: Muraoka Taro <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/.gitattributes b/.gitattributes
index bad1d9edb..15ba03f3e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,12 @@
src/testdir/test42.in diff
+# The old test .ok files are expected to use LF line endings, even on Windows.
+# In src/testdir/Make_mvc.mak and src/testdir/Make_ming.mak, the test result
+# files .out are converted to LF line endings before being compared.
+# Therefore, if the .ok files' line endings are not specified and are
+# converted to CRLF, the comparison between .ok and .out will fail.
+src/testdir/test*.ok text eol=lf
+
# `vim.pot` is updated every time any of the *.c files are modified. And as it
# contains line numbers for strings from *.c files, inserting a line into a
# single .c file may cause many lines in the `vim.pot` file to be updated.
@@ -24,7 +31,7 @@ src/po/vim.pot -diff
src/po/vim.pot diff=ignore_vim_pot
# GitHub reacts to the `linguist-generated` attribute, by ignoring marked files
-# for the repository's language statistics and hiddning changes in these files
+# for the repository's language statistics and hiding changes in these files
# by default in diffs.
#
#
https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a3f2c81c9..b1faa0273 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -536,8 +536,6 @@ jobs:
# Show Windows version
cmd /c ver
- git config --global core.autocrlf input
-
if ${{ matrix.arch == 'x64' }}; then
cygreg=registry
pyreg=
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1vd4Yh-00GmeM-1z%40256bit.org.
