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

Force Unix line endings for all files #367

Merged
merged 2 commits into from
Sep 3, 2014
Merged

Force Unix line endings for all files #367

merged 2 commits into from
Sep 3, 2014

Conversation

teraphy
Copy link
Contributor

@teraphy teraphy commented May 22, 2014

New files that don't contain a script (.sh) or configuration (.conf) are converted over to using the CRLF endings due to the .gitattributes overriding local configurations. gitattributes is only taking into consideration the 2 file extensions. For example config/homebin contains no extension scripts.

This avoids confusion by not having to go that extra step of setting the global config which in turn avoids forcing all GitHub projects in a Windows environment to use Unix style line endings.

@jeremyfelt
Copy link
Member

Thanks for the PR @teraphy!

I've never been good with line endings, which is why I've hesitated here. I'd be happy removing the (old) restriction on just .sh and .conf files, but I want to make sure doing this wouldn't cause another issue somewhere else.

Another option could be to explicitly list the files without extensions that are copied to the virtual machine and need proper line ending handling.

/cc @ericmann

@jeremyfelt
Copy link
Member

See conversation in #438, we're going to merge this in now as it should relieve Windows users. :)

jeremyfelt added a commit that referenced this pull request Sep 3, 2014
Force LF line endings on all text files via .gitattributes
@jeremyfelt jeremyfelt merged commit 35aa052 into Varying-Vagrant-Vagrants:master Sep 3, 2014
@jeremyfelt
Copy link
Member

Thank you for the contribution, @teraphy! I forgot to ask... we're in the middle of a license decision. Are you okay that your contribution is MIT licensed? See #346 for more info.

@teraphy
Copy link
Contributor Author

teraphy commented Sep 4, 2014

@jeremyfelt You're welcome! Glad to help out.
The MIT license is not a problem to me, go for it.

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.

2 participants