Skip to content

Conversation

@DJMcNab
Copy link
Contributor

@DJMcNab DJMcNab commented Apr 7, 2021

Fixes #8378

@matklad
Copy link
Contributor

matklad commented Apr 10, 2021

Probably needs a test as well?

@DJMcNab
Copy link
Contributor Author

DJMcNab commented Apr 11, 2021

Ok, I've added a test

@lnicola
Copy link
Member

lnicola commented May 3, 2021

r? @flodiebold

@DJMcNab can you rebase?

@DJMcNab
Copy link
Contributor Author

DJMcNab commented May 3, 2021

Oof, just confused myself massively by not realising that the main branch is called master instead of my muscle memory main. And then even after typing out this comment, I tried to run git rebase main 😅

Rebased.

@lnicola
Copy link
Member

lnicola commented May 3, 2021

Have you tried git config --global init.defaultBranch master? 😄

@matklad
Copy link
Contributor

matklad commented May 3, 2021

Yeah, we use the same defualt branch as rust-lang/rust repo.

@DJMcNab
Copy link
Contributor Author

DJMcNab commented May 3, 2021

Yeah, I did suspect that was the reason - I don't know how well set-up rust-lang/rust would be for non-master default branches, and it's not high priority.

Obviously I would prefer us to use main, primarily for consistency with the other projects I use and muscle memory purposes. Also it's shorter, which is a bonus.

@flodiebold
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented May 11, 2021

@bors bors bot merged commit da80dfc into rust-lang:master May 11, 2021
@DJMcNab DJMcNab deleted the tail-fallback branch May 11, 2021 19:13
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.

Bug whith cfg blocks

4 participants