aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2025-01-20 01:56:01 +0000
committerJunio C Hamano <gitster@pobox.com>2025-01-21 12:56:05 -0800
commited4cf6e8e29bebb9324ba1a400a6c07513f2d642 (patch)
tree8bb74c942bfb1182ee28a87d4e8f1c52037f82dc
parenteditorconfig: add .adoc extension (diff)
downloadgit-ed4cf6e8e29bebb9324ba1a400a6c07513f2d642.tar.gz
git-ed4cf6e8e29bebb9324ba1a400a6c07513f2d642.zip
gitattributes: mark AsciiDoc files as LF-only
In a future commit, we'll move the AsciiDoc documentation files to the ".adoc" extension rather than the extension ".txt". We need these files to use only LF because they are read by generate-cmdlist.sh using the read builtin. If we allow CRLF here, the CR at the end of the line is treated as part of the synopsis, since a POSIX shell doesn't consider it special like LF. In that case, we generate synopsis strings in C that contain a CR, which the compiler does not like because it believes that the double quote string terminator is missing, and as a consequence, compilation fails. Because we rely on LF-only endings here to compile successfully and we want Git to continue to be able to compile on Windows, mark these files as LF-only in the .gitattributes file. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 158c3d45c4..b38cfd499b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,7 @@
*.bat text eol=crlf
CODE_OF_CONDUCT.md -whitespace
/Documentation/**/*.txt text eol=lf
+/Documentation/**/*.adoc text eol=lf
/command-list.txt text eol=lf
/GIT-VERSION-GEN text eol=lf
/mergetools/* text eol=lf