Skip to content

fix(git): Use git's 429 retry, when available - #17422

Merged
rustbot merged 4 commits into
rust-lang:masterfrom
epage:retry
Sep 1, 2026
Merged

fix(git): Use git's 429 retry, when available#17422
rustbot merged 4 commits into
rust-lang:masterfrom
epage:retry

Conversation

@epage

@epage epage commented Sep 1, 2026

Copy link
Copy Markdown
Contributor

What does this PR try to resolve?

This should reduce noise when failing for non-network reasons.

How to test and review this PR?

@rustbot

rustbot commented Sep 1, 2026

Copy link
Copy Markdown
Collaborator

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: @epage, @weihanglo
  • @epage, @weihanglo expanded to epage, weihanglo

@rustbot rustbot added A-git Area: anything dealing with git A-networking Area: networking issues, curl, etc. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 1, 2026
Comment thread src/sources/git/utils.rs Outdated

@weihanglo weihanglo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

While this changes stable behavior, I don't think this require an FCP:

  • The a retry mechanism change, not a build process change.
  • The retry for git CLI is relatively new (since 1.92 #16016)
  • The original motivation of #16016 was handling HTTP 429, which the new Git config has covered.

@rustbot merge

View changes since this review

Comment thread src/sources/git/utils.rs

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

side note: We probably want to update README.md and https://doc.crates.io/contrib/process/working-on-cargo.html#building-cargo to include the required Git version for Cargo development when git CLI becomes the default.

@epage
epage disabled auto-merge September 1, 2026 18:05
@epage

epage commented Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

Turned off auto-merge while I work through the CI failures in case the results impact the review (e.g. I just changed the error message for git fetch)

This should reduce noise when failing for non-network reasons.
@epage
epage force-pushed the retry branch 2 times, most recently from 37a2e97 to d7736fc Compare September 1, 2026 18:30
@epage

epage commented Sep 1, 2026

Copy link
Copy Markdown
Contributor Author

The error change was from a change in direction that I went back on and I've now removed it (may bring it back in a follow up PR).

CI is looking like it will be green and everything should be good to go now

@weihanglo weihanglo left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rustbot
rustbot added this pull request to the merge queue Sep 1, 2026
Merged via the queue into rust-lang:master with commit 1cc3200 Sep 1, 2026
28 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 1, 2026
@epage
epage deleted the retry branch September 1, 2026 21:50
rust-bors Bot pushed a commit to rust-lang/rust that referenced this pull request Sep 2, 2026
Update cargo submodule



26 commits in e8cb624d5701824f46a2ec5873cfd59ee3d2f66c..b2e9d5f9db3fb1c454ab84f10c16508984a266e2
2026-08-22 00:23:45 +0000 to 2026-09-02 14:49:16 +0000
- fix(parser): Resolve theoretical use-after-free (rust-lang/cargo#17428)
- fix(trim-paths)!: remove default scope from release profile (rust-lang/cargo#17424)
- fix(git): Use git's 429 retry, when available (rust-lang/cargo#17422)
- Avoid passing search path (-L) args when they are passed as --extern (rust-lang/cargo#17410)
- chore(deps): update crate-ci/typos action to v1.50.0 (rust-lang/cargo#17417)
- test: Move -Z onto its own line (rust-lang/cargo#17416)
- chore(triagebot): enable `@rustbot merge/delegate` (rust-lang/cargo#17415)
- Micro-optimize two package dir functions (rust-lang/cargo#17413)
- perf: Do not build SBOM if user has not set build.sbom (rust-lang/cargo#17412)
- feat(manifest)!: implement feature-metadata RFC3416 (rust-lang/cargo#15056)
- Cargo profiling improvements (rust-lang/cargo#17411)
- test(git): Remove gix override run in CI and the mode in code (rust-lang/cargo#17405)
- perf(git): Reduce extra work when using git-cli (rust-lang/cargo#17406)
- feat(resolver): Stabilize min-publish-age (rust-lang/cargo#17335)
- fix(git): Remove ref status update when showing progress  (rust-lang/cargo#17400)
- revert: refactor: move sysroot lookup to GlobalContext (rust-lang/cargo#17401)
- fix(run): Printing a new line to avoid overwriting error code after \r (rust-lang/cargo#17373)
- fix(trim-paths): custom workspace-relative member paths remap (rust-lang/cargo#17366)
- fix(home): rustdoc lint (rust-lang/cargo#17394)
- feat(diag): Stabilize cargo-lints  (rust-lang/cargo#17298)
- chore(deps): Update partial_ref to v0.3.4 (rust-lang/cargo#17392)
- refactor: remove ad-hoc `subslice_range` (rust-lang/cargo#17390)
- docs(changelog): move build-dir new layout to Changed (rust-lang/cargo#17387)
- chore(deps): update msrv (1 version) to v1.98 (rust-lang/cargo#17386)
- docs: Use mdbook admonitions (rust-lang/cargo#17384)
- chore(ci): exclude resolver-tests from intra doc link checks (rust-lang/cargo#17385)
@rustbot rustbot added this to the 1.100.0 milestone Sep 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-git Area: anything dealing with git A-networking Area: networking issues, curl, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants