Skip to content

[beta-1.71] backport #12234 #12242

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
Merged
merged 2 commits into from
Jun 8, 2023
Merged

[beta-1.71] backport #12234 #12242

merged 2 commits into from
Jun 8, 2023

Conversation

@weihanglo
Copy link
Member

@weihanglo weihanglo commented Jun 7, 2023 •
edited
Loading

Beta backports:

In order to make CI pass, the following PRs are also cherry-picked:

@bors @weihanglo
Auto merge of rust-lang#12234 - weihanglo:multiplexing, r=ehuss
1971cb6 
fix: disable multiplexing for some versions of curl
@rustbot
Copy link
Collaborator

rustbot commented Jun 7, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot
Copy link
Collaborator

rustbot commented Jun 7, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.71.0. Please double check that you specified the right target!

@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. A-configuration Area: cargo config files and env vars A-interacts-with-crates.io Area: interaction with registries A-networking Area: networking issues, curl, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 7, 2023
@ehuss
Copy link
Contributor

ehuss commented Jun 8, 2023

Thanks! r=ehuss when CI is passing. I'm guessing it just needs #12241.

@bors @weihanglo
Auto merge of rust-lang#12241 - weihanglo:fix-git-cli-output, r=epage
3ca8c6f 
test: loose overly matches for git cli output

The output format should be stable I believe, but it turns out not.
This is how `git fetch` man page says [^1]:

```
<flag> <summary> <from> -> <to> [<reason>]
```

In Git 2.41 they've changed the fetch output a bit [^2].

I think let's just loose it to prevent future breakages.

[^1]: https://git-scm.com/docs/git-fetch#_output
[^2]: https://github.blog/2023-06-01-highlights-from-git-2-41/
@weihanglo
Copy link
Member Author

weihanglo commented Jun 8, 2023

@bors r=ehuss

Thanks for the prompt review!

@bors
Copy link
Contributor

bors commented Jun 8, 2023

📌 Commit 3ca8c6f has been approved by ehuss

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 8, 2023
@bors
Copy link
Contributor

bors commented Jun 8, 2023

⌛ Testing commit 3ca8c6f with merge cfd3bbd...

@bors
Copy link
Contributor

bors commented Jun 8, 2023

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing cfd3bbd to rust-1.71.0...

@bors bors merged commit cfd3bbd into rust-lang:rust-1.71.0 Jun 8, 2023
@weihanglo weihanglo deleted the rust-1.71.0 branch June 8, 2023 09:50
@weihanglo weihanglo mentioned this pull request Jun 8, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2023
@bors
Auto merge of rust-lang#112421 - weihanglo:update-beta-cargo, r=weiha…
78a6ac0 
…nglo

[beta-1.71] cargo backport

1 commits in 64fb38c97ac4d3a327fc9032c862dd28c8833b17..cfd3bbd8fe4fd92074dfad04b7eb9a923646839f
2023-05-23 18:53:23 +0000 to 2023-06-08 08:44:47 +0000
- [beta-1.70] backport rust-lang/cargo#12234 (rust-lang/cargo#12242)

r? `@ghost`
@weihanglo weihanglo changed the title [beta-1.70] backport #12234 [beta-1.71] backport #12234 Jun 12, 2023
@ehuss ehuss added this to the 1.71.0 milestone Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@ehuss ehuss

Labels

A-cli Area: Command-line interface, option parsing, etc. A-configuration Area: cargo config files and env vars A-interacts-with-crates.io Area: interaction with registries A-networking Area: networking issues, curl, etc. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.

4 participants

@weihanglo @rustbot @ehuss @bors