Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upchore: force patches to be checked out with LF line endings #14789
+3
−0
Conversation
nornagon
requested a review
from
as a
code owner
Sep 24, 2018
MarshallOfSound
approved these changes
Sep 25, 2018
MarshallOfSound
merged commit 442f05d
into
master
Sep 25, 2018
28 checks passed
Semantic Pull Request
ready to be squashed
Details
WIP
ready for review
Details
appveyor: win-ia32-debug
AppVeyor build succeeded
Details
appveyor: win-ia32-testing
AppVeyor build succeeded
Details
appveyor: win-ia32-testing-pr
AppVeyor build succeeded
Details
appveyor: win-x64-debug
AppVeyor build succeeded
Details
appveyor: win-x64-testing
AppVeyor build succeeded
Details
appveyor: win-x64-testing-pr
AppVeyor build succeeded
Details
ci/circleci: linux-arm-checkout
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm-debug
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm-ffmpeg
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm-testing
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-checkout
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-debug
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-ffmpeg
Your tests passed on CircleCI!
Details
ci/circleci: linux-arm64-testing
Your tests passed on CircleCI!
Details
ci/circleci: linux-checkout
Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-debug
Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-ffmpeg
Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-testing
Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-testing-tests
Your tests passed on CircleCI!
Details
ci/circleci: linux-ia32-testing-verify-ffmpeg
Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-debug
Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-ffmpeg
Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-testing
Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-testing-tests
Your tests passed on CircleCI!
Details
ci/circleci: linux-x64-testing-verify-ffmpeg
Your tests passed on CircleCI!
Details
release-notes
Release notes found
This comment has been minimized.
This comment has been minimized.
release-clerk
bot
commented
Sep 25, 2018
|
No Release Notes |
MarshallOfSound
deleted the
patch-gitattributes
branch
Sep 25, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
nornagon commentedSep 24, 2018
•
edited
If a user has core.autoclrf set to true in their git config, on Windows, git
will check out .patch files with CRLF line endings, which
git applydoesn'tunderstand (& thus
gclient syncwill fail with a message about being unableto apply patches). This forces git to always check out *.patch files with LF
line endings, regardless of the core.autoclrf setting.
Ref #14662, and thanks to @vulture for the suggestion.
Notes: no-notes