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.

Sign up for GitHub

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

Jump to bottom

Fix tidy on Windows #36

Merged
merged 1 commit into from
Apr 6, 2017
Merged

Fix tidy on Windows #36

merged 1 commit into from
Apr 6, 2017

Conversation

petrochenkov
Copy link
Contributor

This is exactly the same issue as rust-lang/book#549, x.py test src/tools/tidy is failing again.
r? @steveklabnik @carols10cents

carols10cents
carols10cents approved these changes Apr 5, 2017
View reviewed changes
Copy link
Member

@carols10cents carols10cents left a comment

Choose a reason for hiding this comment

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

I don't have r here, but lgtm!

@steveklabnik steveklabnik merged commit 3a64d81 into rust-lang:master Apr 6, 2017
@steveklabnik
Copy link
Member

Thanks!

@steveklabnik
Copy link
Member

x.py test src/tools/tidy is failing again.

incidentally, how did you notice this? Did you try to update the submodule yourself?

@petrochenkov
Copy link
Contributor Author

@steveklabnik
Default git settings on Windows is "checkout as \r\n, commit as \n", so this issue reproduced automatically when I updated the Rust repo and run tidy.
This can be solved by adding .gitattributes to the repo once, or changing settings to "checkout as \n" by all people testing Rust on Windows. Adding .gitattributes seems nicer and the main repo did this, but every time someone creates a new submodule and forgets to add .gitattributes the problem repeats.

@petrochenkov petrochenkov mentioned this pull request Apr 6, 2017
Closed
@petrochenkov petrochenkov mentioned this pull request Jan 26, 2018
Merged
This was referenced Dec 1, 2018
Merged
Merged
mark-i-m pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Dec 1, 2018
@petrochenkov @mark-i-m
Fix failing tidy (line endings on Windows) (#246)
2f4e10c 
This happens every time a new doc submodule is added to https://github.com/rust-lang/rust.
cc rust-lang/book#549 rust-lang/reference#36 rust-lang/rust-by-example#1018
@petrochenkov petrochenkov mentioned this pull request Feb 10, 2019
Merged
bors bot added a commit to rust-embedded/book that referenced this pull request Feb 10, 2019
@bors @petrochenkov
Merge #127
bd2778f 
127: Fix failing tidy (line endings on Windows) r=japaric a=petrochenkov

This happens every time a new doc submodule is added to https://github.com/rust-lang/rust.

cc rust-lang/book#549 rust-lang/reference#36 rust-lang/rust-by-example#1018 rust-lang/rustc-dev-guide#246

Co-authored-by: Vadim Petrochenkov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carols10cents carols10cents carols10cents approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@petrochenkov @steveklabnik @carols10cents