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

make sure that new lines are handled correctly on windows #2026

Merged
merged 3 commits into from
May 29, 2020

Conversation

jenshnielsen
Copy link
Collaborator

As suggested here https://www.edwardthomson.com/blog/git_for_windows_line_endings.html
I had this problem again for some reason on #2005

@codecov
Copy link

codecov bot commented May 29, 2020

Codecov Report

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

@@           Coverage Diff           @@
##           master    #2026   +/-   ##
=======================================
  Coverage   71.13%   71.13%           
=======================================
  Files         145      145           
  Lines       19499    19499           
=======================================
  Hits        13870    13870           
  Misses       5629     5629           

@jenshnielsen
Copy link
Collaborator Author

As suggested here https://jessitron.com/2019/11/11/line-endings-in-git/ its probably best to not convert bat and cmd file like the build script for the docs

Copy link
Contributor

@astafan8 astafan8 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love it! ( finally ;) )

@jenshnielsen
Copy link
Collaborator Author

jenshnielsen commented May 29, 2020

For future reference I had somehow manged to check the file with Windows line ending. It was not possible to convert it until I explicitly disabled safecrlf

safecrlf normally blocks from potentially destructive conversions of line ending. Fixing wrong line endings is potentially destructive so the setting needs to be disabled

@jenshnielsen jenshnielsen merged commit 9826ba3 into microsoft:master May 29, 2020
@jenshnielsen jenshnielsen deleted the add_gitattribute branch May 29, 2020 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants