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

Explicitly set newline when rewriting for release #7600

Merged
merged 2 commits into from
Jan 18, 2020

Conversation

uranusjr
Copy link
Member

Set the newline to always be \n. This is probably fine because we are committing the files immediately anyway, and Git would perform the necessary normalisation on checkout for people running core.autocrlf with true or input.

@xavfernandez xavfernandez added skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes labels Jan 15, 2020
@pradyunsg
Copy link
Member

note: merge conflicts!

@pradyunsg pradyunsg added the C: automation Automated checks, CI etc label Jan 15, 2020
@pradyunsg pradyunsg merged commit c55eee4 into pypa:master Jan 18, 2020
@pradyunsg
Copy link
Member

Note: this was squash merged, to avoid adding another quirk to git graph -- it's bad enough already. :)

@pradyunsg
Copy link
Member

As always, thanks @uranusjr for trying this out and for filing the PR! ^>^

deepak1725 pushed a commit to deepak1725/pip that referenced this pull request Jan 20, 2020
@pfmoore pfmoore mentioned this pull request Jan 22, 2020
pradyunsg added a commit that referenced this pull request Jan 23, 2020
@lock lock bot added the auto-locked Outdated issues that have been locked by automation label Feb 17, 2020
@lock lock bot locked as resolved and limited conversation to collaborators Feb 17, 2020
@uranusjr uranusjr deleted the release-rewrite-lineendings branch September 28, 2020 14:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-locked Outdated issues that have been locked by automation C: automation Automated checks, CI etc skip news Does not need a NEWS file entry (eg: trivial changes) type: maintenance Related to Development and Maintenance Processes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants