Force LF line endings on patch/diff files via .gitattributes#258
Merged
tedwaine merged 1 commit intoMay 27, 2026
Merged
Conversation
Windows clones with the default core.autocrlf=true convert .patch
files to CRLF on checkout. git apply (used by vcpkg overlay ports)
rejects CRLF in diff hunk headers ("corrupt patch at line N"),
breaking vcpkg builds. Forcing eol=lf on *.patch and *.diff makes
the working-tree files LF regardless of host autocrlf setting,
so the patch step works on every platform without per-developer
git config.
See hydralab issue AcademySoftwareFoundation#36.
Signed-off-by: Ben de Luca <bdeluca@gmail.com>
bdeluca
force-pushed
the
pr/gitattributes-lf-on-patches
branch
from
c9519f7 to
7176da5
Compare
tedwaine
merged commit bbce83d
into
AcademySoftwareFoundation:develop
2 of 3 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
On Windows the default git config (
core.autocrlf=true) converts text files to CRLF on checkout.git apply— used by the vcpkg overlay-port mechanism — rejects CRLF in diff hunk headers withcorrupt patch at line N, breaking any vcpkg port that applies a patch as part of its build.Adding a top-level
.gitattributesthat forceseol=lfon*.patchand*.diffmakes those files check out with LF regardless of host autocrlf setting, sogit applyworks on every platform without per-developer git config.The
* text=autoline preserves git's normal text-file handling for everything else; only.patchand.diffget the explicit LF requirement.Linux / macOS impact
None.