Skip to content
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

Fix line endings to LF #1253

Merged
merged 2 commits into from
Nov 5, 2020
Merged

Conversation

danielthegray
Copy link
Contributor

@danielthegray danielthegray commented Nov 5, 2020

These files had mixed line endings it seems, and were always appearing
as uncommitted changes in my environment, which makes it harder to see
the changed state of things (I'm on Linux), and also makes it impossible to do some switches between branches.

These files had mixed line endings it seems, and were always appearing
as uncommitted changes in my environment, which makes it harder to see
the changed state of things (I'm on Linux).
@codecov-io
Copy link

codecov-io commented Nov 5, 2020

Codecov Report

Merging #1253 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1253   +/-   ##
=========================================
  Coverage     93.81%   93.81%           
  Complexity      458      458           
=========================================
  Files             2        2           
  Lines          6753     6753           
  Branches       1823     1823           
=========================================
  Hits           6335     6335           
  Misses          126      126           
  Partials        292      292           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9c2447d...03c7155. Read the comment docs.

@deining
Copy link
Contributor

deining commented Nov 5, 2020

Great to see a PR that addresses this issue, since I was bothered from/struggling with this issue, too (I'm on Windows most of the time).
I hope this won't be reintroduced when regenerating the docs. I saw the issue come first two weeks ago (or so), shortly after we upgraded the asciidcotor-gradle-plugin. IIRC, it disappeared for some time and then came back again. I couldn't find any pattern and didn't have the time to investigate this, though.

@danielthegray
Copy link
Contributor Author

danielthegray commented Nov 5, 2020

It might still be there, after regenerating the docs. I notice that it's always the same snippet. The asciidocs thing must be pulling this snippet from one file. I will try to make all the files in the docs folder just have Unix line endings.

EDIT: I ran dos2unix on all of the .html and .adoc files on the repo and no other changes seem to be found, so I think this is everything that was missing.

@danielthegray
Copy link
Contributor Author

I've changed the entry for .html files in the .gitattributes file to ensure that the file is always checked in with LF line endings. I hope this fixes it. It seems that it introduced by the Asciidoctor documentation generation, it must have that faulty CSS/JS snippet inside its code somewhere, but this should hopefully keep it fixed more permanently.

@remkop remkop added this to the 4.6 milestone Nov 5, 2020
@remkop remkop merged commit f3eea16 into remkop:master Nov 5, 2020
@remkop
Copy link
Owner

remkop commented Nov 5, 2020

Merged.
Thanks for the contribution!

@danielthegray danielthegray deleted the fix-line-endings branch November 5, 2020 21:14
remkop added a commit that referenced this pull request Nov 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants