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

Revert "warn_old_master_branch" check #131331

Merged
merged 2 commits into from
Oct 7, 2024
Merged

Conversation

onur-ozkan
Copy link
Member

See #131296 (comment).

Reverts #130121 and #129584.

Fixes #131296 and #131324.

…old-upstream-worktree, r=albertlarsan68"

This reverts commit 507c05b, reversing
changes made to 0609062.
@rustbot
Copy link
Collaborator

rustbot commented Oct 6, 2024

r? @Kobzol

rustbot has assigned @Kobzol.
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

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 6, 2024
…warning, r=albertlarsan68"

This reverts commit 776187d, reversing
changes made to 7d01557.
@Kobzol
Copy link
Contributor

Kobzol commented Oct 7, 2024

I agree that poking into the internals of git manually is not a good idea, unless we want to include libgit2/gix as a dependency (which we probably don't). Not sure if this really fixes #131324, as I could not reproduce it locally even after running git gc.

It should definitely fix #131296 though.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 7, 2024

📌 Commit 1e5c4cb has been approved by Kobzol

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 Oct 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#131331 (Revert "warn_old_master_branch" check)
 - rust-lang#131344 (Avoid `&Lrc<T>` in various places)
 - rust-lang#131346 (Restrict `ignore-mode-*` directives)
 - rust-lang#131353 (Add documentation for `runtest::check_rustdoc_test_option` method)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3a5a816 into rust-lang:master Oct 7, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 7, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 7, 2024
Rollup merge of rust-lang#131331 - onur-ozkan:131296, r=Kobzol

Revert "warn_old_master_branch" check

See rust-lang#131296 (comment).

Reverts rust-lang#130121 and rust-lang#129584.

Fixes rust-lang#131296 and rust-lang#131324.
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.

Bootstrap shows unexpected warning: unable to check if origin/master is old due to error
4 participants