Skip to content

Conversation

weihanglo
Copy link
Member

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.

Footnotes

  1. https://git-scm.com/docs/git-fetch#_output

  2. https://github.blog/2023-06-01-highlights-from-git-2-41/

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/
@rustbot
Copy link
Collaborator

rustbot commented Jun 7, 2023

r? @ehuss

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 7, 2023
@epage
Copy link
Contributor

epage commented Jun 7, 2023

@bors r+

@bors
Copy link
Contributor

bors commented Jun 7, 2023

📌 Commit 51ebba2 has been approved by epage

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 7, 2023
@bors
Copy link
Contributor

bors commented Jun 7, 2023

⌛ Testing commit 51ebba2 with merge 69ea85c...

@bors
Copy link
Contributor

bors commented Jun 7, 2023

☀️ Test successful - checks-actions
Approved by: epage
Pushing 69ea85c to master...

@bors bors merged commit 69ea85c into rust-lang:master Jun 7, 2023
@weihanglo weihanglo deleted the fix-git-cli-output branch June 7, 2023 23:04
weihanglo pushed a commit to weihanglo/cargo that referenced this pull request Jun 8, 2023
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/
bors added a commit that referenced this pull request Jun 8, 2023
[beta-1.70] backport #12234

Beta backports:

- #12234

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

- #12241
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 10, 2023
Update cargo

12 commits in b0fa79679e717cd077b7fc0fa4166f47107f1ba9..49b6d9e179a91cf7645142541c9563443f64bf2b
2023-06-03 14:19:48 +0000 to 2023-06-09 17:21:19 +0000
- docs: doc comments for all registry kinds (rust-lang/cargo#12247)
- chore: Migrate print-ban from test to clippy (rust-lang/cargo#12246)
- fix: fetch nested git submodules (rust-lang/cargo#12244)
- refactor: registry source cleanup (rust-lang/cargo#12240)
- test: loose overly matches for git cli output (rust-lang/cargo#12241)
- fix: disable multiplexing on macOS for some versions of curl (rust-lang/cargo#12234)
- docs: doc comments for registry source and index (rust-lang/cargo#12239)
- doc: point to nightly cargo doc (rust-lang/cargo#12237)
- Upgrade to `gix` v0.45 for multi-round pack negotiations. (rust-lang/cargo#12236)
- refactor: git source cleanup (rust-lang/cargo#12197)
- Add message on reusing previous temporary path on failed cargo installs (rust-lang/cargo#12231)
- doc: the first line should be a simple sentence instead of a heading (rust-lang/cargo#12228)

r? `@ghost`
@ehuss ehuss added this to the 1.72.0 milestone Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants