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 #709

Merged
merged 2 commits into from Dec 18, 2018

Conversation

Projects
None yet
3 participants
@davidfischer
Copy link
Contributor

davidfischer commented Dec 18, 2018

Unfortunately this is very hard to test but I believe this change will fix the issues with CRLF in the .bat file. Another possibility is simply to remove the line * text eol=lf in .gitattributes.

https://www.git-scm.com/docs/gitattributes
https://help.github.com/articles/dealing-with-line-endings/

Fixes #708.

davidfischer added some commits Dec 18, 2018

Remove line endings on .bat
It will be normalized correctly on checkout

@davidfischer davidfischer requested review from jessetan , Blendify and rtfd/core Dec 18, 2018

@Blendify Blendify merged commit ab10feb into master Dec 18, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@stsewd stsewd deleted the davidfischer/fix-line-endings branch Dec 18, 2018

@davidfischer

This comment has been minimized.

Copy link
Contributor

davidfischer commented Dec 18, 2018

I know I mentioned this is hard to test but I did test this after merging and it does appear to fix the problem.

@jessetan

This comment has been minimized.

Copy link
Contributor

jessetan commented Dec 21, 2018

I sure hope this helps because I now have the original problem every time I switch branches that did not have this change yet. It should work itself out eventually, but maybe removing * text eol=lf (setting it to auto) would be preferable if it also solves the original issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment