mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-02-01 11:33:15 +01:00
0084e4bd16
This change does 2 things:
1) Mark src/testdir/test21.ok as binary by git.
After 0ed8ba3079, 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 <cb@256bit.org>
41 lines
2.1 KiB
Plaintext
41 lines
2.1 KiB
Plaintext
# 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
|
|
|
|
# This ok file contains literal CR LF endings. Should not be touched by git,
|
|
# so handle as binary
|
|
src/testdir/test21.ok -text
|
|
|
|
# `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.
|
|
#
|
|
# This generates a lot of "noise" in the diffs. And especially considering that
|
|
# `vim.pot` is a generated file, looking at changes in this file is not useful.
|
|
#
|
|
# By marking it as binary we tell the git machinery that it should not be
|
|
# presented to the user in patches, use "git diff --text" to override
|
|
src/po/vim.pot -diff
|
|
|
|
# Although vim.pot has been marked as binary, you may want to check the textual differences
|
|
# using git --text but still want to ignore some noisy output like:
|
|
# - POT-Creation Date
|
|
# - comments pointing to the message source location in
|
|
# *.c/*.h/*.vim/*.cpp/*.in/*.xs files followed by line numbers
|
|
# Note: location comments should be no longer part of vim.pot, since commit 2844765e903214490e1
|
|
# which add the --no-location argument for xgettext to no longer ouput such comments
|
|
#
|
|
# To ignore certain changes, setup a custom textconv filter using:
|
|
# git config diff.ignore_vim_pot.textconv "grep -Ev '^.(POT-Creation-Date:|.*\\.([ch]|vim|in|xs|cpp):).*$'"
|
|
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 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
|
|
src/po/vim.pot linguist-generated=true
|