Add support for git's core.autocrlf
#1114
Merged
Conversation
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
Among others, Spotless uses .gitattributes to determine the line ending of files. In the absence of this file, Spotless falls back to `core.eol` from git config. Before this commit, Spotless ignored the `core.autocrlf` property. Git behaves in such a way that it ignores `core.eol` if `core.autocrlf` is set to `true` or `input`. This commit aligns the behavior of Spotless to favor `core.autocrlf` over `core.eol`. Fixes #540 Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
nedtwigg
requested changes
Jan 31, 2022
Member
nedtwigg
left a comment
There was a problem hiding this comment.
Main thing is that you need to run spotlessApply so that CI passes. But also the code could be a tad more explicit.
lib-extra/src/main/java/com/diffplug/spotless/extra/GitAttributesLineEndings.java
Show resolved
Hide resolved
Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
Signed-off-by: Roland Weisleder <roland.weisleder@googlemail.com>
Member
|
Published in |
5 tasks
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.
Among others, Spotless uses .gitattributes to determine the line ending of files. In the absence of this file, Spotless falls back to
core.eolfrom git config.Before this commit, Spotless ignored the
core.autocrlfproperty. Git behaves in such a way that it ignorescore.eolifcore.autocrlfis set totrueorinput. This commit aligns the behavior of Spotless to favorcore.autocrlfovercore.eol.If merged, this fixes #540.