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

Backport remerge #5334

Merged
merged 2 commits into from
Mar 25, 2020
Merged

Backport remerge #5334

merged 2 commits into from
Mar 25, 2020

Conversation

flip1995
Copy link
Member

blocked on landing the backport

cc @ehuss

changelog: none

bors and others added 2 commits March 17, 2020 10:00
Remove git2 dependency.

This removes the `git2` dependency (used in the integration test).  Updating git2 is awkward because both cargo and clippy have to be updated in sync, so this removes that requirement. It didn't look like it was using the git2 library for any particular reason, so this just launches the `git` executable, which should be available more or less everywhere.

This unblocks updating Cargo.

changelog: none
@flip1995 flip1995 added the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label Mar 18, 2020
@flip1995
Copy link
Member Author

@bors treeclosed-

@flip1995
Copy link
Member Author

The backport was merged in rust-lang/rust#70244

@flip1995 flip1995 removed the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label Mar 25, 2020
@flip1995
Copy link
Member Author

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 25, 2020

📌 Commit ba7a1a4 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Mar 25, 2020

⌛ Testing commit ba7a1a4 with merge 2ff568d...

@bors
Copy link
Collaborator

bors commented Mar 25, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 2ff568d to master...

@bors bors merged commit 2ff568d into rust-lang:master Mar 25, 2020
@flip1995 flip1995 deleted the backport_remerge branch May 4, 2020 15:29
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.

2 participants