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

Rustup to *1.10.0-nightly (cd6a40017 2016-05-16)*, bump to 0.0.68 #942

Merged
merged 2 commits into from
May 17, 2016

Conversation

mcarton
Copy link
Member

@mcarton mcarton commented May 17, 2016

Ref rust-lang/rust#33505.
Fix #941.
Fix tests for #940.

@Manishearth Manishearth merged commit 4347250 into master May 17, 2016
@Manishearth Manishearth deleted the rustup branch May 17, 2016 21:38
@mcarton mcarton mentioned this pull request May 17, 2016
@crumblingstatue
Copy link

What is going on here exactly?

This was merged, but it's not present in master.

Did somebody forcibly erase these commits from git history?

@Manishearth
Copy link
Member

@crumblingstatue
Copy link

I see them here: https://github.com/Manishearth/rust-clippy/commits/master

Really? That's weird, because I really don't

Not just on GitHub, but I also couldn't pull these changes with git locally.

@zetok
Copy link

zetok commented May 18, 2016

Did somebody forcibly erase these commits from git history?

Maybe github has a problem? Or @Manishearth sees a local, cached version:

1
2

@Manishearth
Copy link
Member

It's right below "fix typos" for me

@Manishearth
Copy link
Member

The dates are broken, seems to be a github side issue

@Manishearth
Copy link
Member

Wait, no, sorry, I don't see them either

@Manishearth
Copy link
Member

I re-merged the commits

@Manishearth
Copy link
Member

Also branch-protected master

@zetok
Copy link

zetok commented May 18, 2016

Also branch-protected master

Err, it doesn't seem to be protected?
no protection

@Manishearth
Copy link
Member

Fixed, you need to enter your password again to confirm

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.

4 participants