-
Notifications
You must be signed in to change notification settings - Fork 829
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
Add .gitattributes. #1798
Add .gitattributes. #1798
Conversation
This fixes spotlessCheck when checking out on windows with git core.eol=crlf and core.autocrlf=true. Note that for git itself, the eol=lf next to the text=auto changes nothing, but spotless tries enforce the core.eol line endings anyway.
Codecov Report
@@ Coverage Diff @@
## master #1798 +/- ##
============================================
+ Coverage 85.53% 85.56% +0.03%
Complexity 1374 1374
============================================
Files 166 166
Lines 5308 5308
Branches 549 549
============================================
+ Hits 4540 4542 +2
+ Misses 569 568 -1
+ Partials 199 198 -1
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! I can't evaluate if this will help windows users or not, but if you say so, then 👍
I think you should be able to reproduce the issue on non-Windows by using |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I think we need a gitattributes file I always have issues on windows without it.
@Oberon00 What do you think about a simpler one like we use in instrumentation repo?
https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/master/.gitattributes
+1 to having the same |
The simpler one should also be fine. |
That said, I think at least the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
closing and reopening for the CLA bot |
This fixes
spotlessCheck
when checking out on windows with gitcore.eol=crlf
andcore.autocrlf=true
.Note that for git itself, the eol=lf next to the text=auto changes nothing, but spotless tries to
enforce the core.eol line endings anyway.
Use https://github.com/open-telemetry/opentelemetry-java/pull/1798/files?w=1 (note the ?w=1) to verify that only whitespace (line endings) is changed in the batch files.