git: checkout cs files with crlf#1372
Merged
Rob-Hague merged 2 commits intosshnet:developfrom Apr 17, 2024
Merged
Conversation
scott-xu
approved these changes
Apr 7, 2024
Collaborator
|
Fine for me either way, just wondering if it makes more sense to stop enforcing crlf in the .editorconfig? i.e. delete this line instead Line 10 in 7b58819 For reference, the dotnet/runtime .editorconfig and .gitattributes: https://github.com/dotnet/runtime/blob/main/.editorconfig |
instead of forcing crlf checkout in git
Contributor
Author
|
Yeah, I think that makes even more sense, thanks. Pushed. |
Rob-Hague
approved these changes
Apr 8, 2024
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
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.
Currently, when you clone the repository on a Linux machine, all cs files have the wrong line endings. The .editorconfig file enforces crlf, but git will checkout the files with the default OS file encoding by default (lf).
This causes a
dotnet format whitespace --verify-no-changesto complain about the line endings on a fresh working copy.Tell git to checkout *.cs files with crlf to fix this. Note that existing linux working copies would need to run the following to fix the newlines after pulling in this change:
git rm -rf --cached . && git reset --hard HEAD.I noticed this while looking into enforcing formatting in CI, but that's for a separate PR.