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

Pass branch.{branch}.remote=origin to git submodule update #106106

Merged
merged 1 commit into from
Jan 30, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 24, 2022

This works around a bug in git itself.
Fixes #101144.

@WaffleLapkin
Copy link
Member

Why is this not assigned to anyone?...

@jyn514
Copy link
Member Author

jyn514 commented Jan 10, 2023

r? @Mark-Simulacrum

@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 28, 2023
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 29, 2023

📌 Commit 6a3ebe6 has been approved by Mark-Simulacrum

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 Jan 29, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jan 29, 2023
…ark-Simulacrum

Pass `branch.{branch}.remote=origin` to `git submodule update`

This works around a bug in git itself.
Fixes rust-lang#101144.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2023
Rollup of 6 pull requests

Successful merges:

 - rust-lang#101569 (Don't re-export private/unstable ArgumentV1 from `alloc`.)
 - rust-lang#106106 (Pass `branch.{branch}.remote=origin` to `git submodule update`)
 - rust-lang#107146 (Make `unsizing_params_for_adt` into a query)
 - rust-lang#107264 (Add option to include private items in library docs)
 - rust-lang#107452 (Fix typo in `{Rc, Arc}::get_mut_unchecked` docs)
 - rust-lang#107459 (end entry paragraph with a period (.))

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4e5cfab into rust-lang:master Jan 30, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 30, 2023
@jyn514 jyn514 deleted the remote-tracking-branch branch February 25, 2023 18:32
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. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

x.py submodule handling breaks when tracking upstream as upstream
5 participants