git/.gitattributes, branch v2.50.1

merge-file doc: set conflict-marker-size attribute

2025-03-29T01:31:19Z

When committing a conflict resolution for a merge containing 1f010d6bdf7 (doc: use .adoc extension for AsciiDoc files, 2025-01-20) my pre-commit hook failed because "git diff --check" thought there was a left over conflict marker in "merge-file.adoc". Fix this by setting the "conflict-marker-size" attribute as we do for all the other documentation files that contain example conflict markers. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

.gitattributes: more .txt -> .adoc updates

2025-03-03T21:49:19Z

All Documentation files now end in .adoc. Update the entries for git-merge.adoc, gitk.adoc, and user-manual.adoc to properly set the conflict-marker-size attribute. Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

Remove obsolete ".txt" extensions for AsciiDoc files

2025-01-21T20:56:10Z

Since we no longer have any AsciiDoc files that end in ".txt", don't modify them with .gitattributes or ignore them with .gitignore. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano

gitattributes: mark AsciiDoc files as LF-only

2025-01-21T20:56:05Z

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 Signed-off-by: Junio C Hamano

.gitattributes: include `text` attribute for eol attributes

2023-02-06T21:57:08Z

The standard advice for text file eol endings in the .gitattributes file was updated in e28eae3184 (gitattributes: Document the unified "auto" handling, 2016-08-26) with a recent clarification in 8c591dbfce (docs: correct documentation about eol attribute, 2022-01-11), with a follow up comment by the original author in [1] confirming the use of the eol attribute in conjunction with the text attribute. Update Git's .gitattributes file to reflect our own advice. [1] https://lore.kernel.org/git/?q=%3C20220216115239.uo2ie3flaqo3nf2d%40tb-raspi4%3E. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

CoC: explicitly take any whitespace breakage

2021-01-04T17:44:49Z

We'll keep this document mostly in sync with the upstream; let's help "git am" and "git show" by telling them that they may introduce what we may consider whitespace errors. Signed-off-by: Junio C Hamano

Mark .bat files as requiring CR/LF endings

2019-06-20T21:03:05Z

Just like the natural line ending for Unix shell scripts consist of a single Line Feed, the natural line ending for (DOS) Batch scripts consists of a Carriage Return followed by a Line Feed. It seems that both Unix shell script interpreters and the interpreter for Batch scripts (`cmd.exe`) are keen on seeing the "right" line endings. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'ds/hash-independent-tests-fix' into maint

2018-12-15T03:24:32Z

Test portability fix. * ds/hash-independent-tests-fix: .gitattributes: ensure t/oid-info/* has eol=lf

.gitattributes: ensure t/oid-info/* has eol=lf

2018-12-14T03:53:06Z

The new test_oid machinery in the test library requires reading some information from t/oid-info/hash-info and t/oid-info/oid. The logic to read from these files in shell uses built-in "read" command, which leaves CR at the end of these text files when they are checked out with CRLF line endings, at least when run with bash shipped with Git for Windows. This results in an unexpected value in the variable these lines are read into, leading the tests to fail. Mark them to be checked out always with the LF line endings. Signed-off-by: Derrick Stolee Signed-off-by: Junio C Hamano

build: fix broken command-list.h generation with core.autocrlf

2018-11-12T07:39:17Z

The script generate-cmdlist.sh needs input text files in UNIX line ending to work correctly. It's been fine even with core.autocrlf set because Documentation/git-*.txt is forced LF conversion. But this leaves out gitk.txt and also Documentation/*config.txt that recently becomes new input for this script. Update the attribute file to force LF on all *.txt files to be on the safe side. For more details, please see 00ddc9d13c (Fix build with core.autocrlf=true - 2017-05-09) Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano