Skip to content

Disable all git EOL conversions#32781

Merged
vtjnash merged 1 commit intoJuliaLang:masterfrom
davidanthoff:eol-windows2
Oct 15, 2019
Merged

Disable all git EOL conversions#32781
vtjnash merged 1 commit intoJuliaLang:masterfrom
davidanthoff:eol-windows2

Conversation

@davidanthoff
Copy link
Copy Markdown
Contributor

This replaces #27291, or rather is a second attempt to achieve the same thing. #27291 was reverted because it only worked with git >=2.10 and that was deemed unacceptable.

I think this PR here should also work with older git versions, but I'm not 100% positive.

I think if this was merged it should happen sometime early in a release cycle. If this PR does not work for some reason, it would probably be fairly disruptive, so better to try it early in a cycle rather than just before a release. So now might be a good time :)

CCing @vtjnash, @ararslan.

@Keno
Copy link
Copy Markdown
Member

Keno commented Aug 3, 2019

doesn't turning off the text attribute also prevent nice diffs?

@davidanthoff
Copy link
Copy Markdown
Contributor Author

My understanding is that the text attribute only controls eol handling, and that diff behavior is controlled by the diff attribute, which this PR is not changing. If we were using the binary macro it would disable eol adjustments and diffing. At least that is how I’m reading https://git-scm.com/docs/gitattributes.

But probably worth trying things out on a number of systems, just to be sure we’re not breaking things.

@vtjnash vtjnash merged commit b547942 into JuliaLang:master Oct 15, 2019
@davidanthoff davidanthoff deleted the eol-windows2 branch October 15, 2019 19:10
@vtjnash vtjnash mentioned this pull request Oct 28, 2019
12 tasks
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.

3 participants