New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: force patches to be checked out with LF line endings #14789

Merged
merged 1 commit into from Sep 25, 2018

Conversation

Projects
None yet
3 participants
@nornagon
Contributor

nornagon commented Sep 24, 2018

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 apply doesn't
understand (& thus gclient sync will fail with a message about being unable
to 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.

  • PR description included and stakeholders cc'd
  • PR title follows semantic commit guidelines

Notes: no-notes

@nornagon nornagon requested a review from electron/reviewers as a code owner Sep 24, 2018

@jkleinsc

LGTM

@MarshallOfSound 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
@release-clerk

This comment has been minimized.

release-clerk bot commented Sep 25, 2018

No Release Notes

@MarshallOfSound 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