warn the user if the upstream master branch is old#129584
Merged
bors merged 3 commits intorust-lang:masterfrom Sep 5, 2024
Merged
warn the user if the upstream master branch is old#129584bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
Collaborator
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) some time within the next two weeks. Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (
|
rustbot
added
S-waiting-on-review
lolbinarycat
force-pushed
the
old-upstream-warning
branch
from
f0d2905 to
0c9bc45
Compare
lolbinarycat
force-pushed
the
old-upstream-warning
branch
from
0c9bc45 to
94e9c4c
Compare
This comment has been minimized.
This comment has been minimized.
albertlarsan68
approved these changes
Sep 4, 2024
Member
|
Thanks for the PR! @bors r+ |
Collaborator
bors
added
S-waiting-on-bors
tgross35
added a commit
to tgross35/rust
that referenced
this pull request
Sep 5, 2024
… r=albertlarsan68 warn the user if the upstream master branch is old fixes rust-lang#129528
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 5, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#101339 (enable -Zrandomize-layout in debug CI builds ) - rust-lang#120736 (rustdoc: add header map to the table of contents) - rust-lang#127021 (Add target support for RTEMS Arm) - rust-lang#128928 (CI: rfl: add more tools and steps) - rust-lang#129584 (warn the user if the upstream master branch is old) - rust-lang#129664 (Arbitrary self types v2: pointers feature gate.) - rust-lang#129752 (Make supertrait and implied predicates queries defaulted) - rust-lang#129918 (Update docs of `missing_abi` lint) - rust-lang#129919 (Stabilize `waker_getters`) - rust-lang#129925 (remove deprecated option `rust.split-debuginfo`) Failed merges: - rust-lang#129789 (rustdoc: use strategic boxing to shrink `clean::Item`) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 5, 2024
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#101339 (enable -Zrandomize-layout in debug CI builds ) - rust-lang#120736 (rustdoc: add header map to the table of contents) - rust-lang#127021 (Add target support for RTEMS Arm) - rust-lang#128928 (CI: rfl: add more tools and steps) - rust-lang#129584 (warn the user if the upstream master branch is old) - rust-lang#129664 (Arbitrary self types v2: pointers feature gate.) - rust-lang#129752 (Make supertrait and implied predicates queries defaulted) - rust-lang#129918 (Update docs of `missing_abi` lint) - rust-lang#129919 (Stabilize `waker_getters`) - rust-lang#129925 (remove deprecated option `rust.split-debuginfo`) Failed merges: - rust-lang#129789 (rustdoc: use strategic boxing to shrink `clean::Item`) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 5, 2024
Rollup merge of rust-lang#129584 - lolbinarycat:old-upstream-warning, r=albertlarsan68 warn the user if the upstream master branch is old fixes rust-lang#129528
RalfJung
reviewed
Sep 9, 2024
| use std::time::Duration; | ||
| const WARN_AFTER: Duration = Duration::from_secs(60 * 60 * 24 * 10); | ||
| let updated_master = updated_master_branch(config, Some(git_dir))?; | ||
| let branch_path = git_dir.join(".git/refs/remotes").join(&updated_master); |
Member
There was a problem hiding this comment.
This logic is incorrect for git worktrees, where .git is not a folder -- it is a file containing the path to where the .git folder lies.
Please either fix this PR or revert it, currently it causes incorrect warnings for everyone using worktrees.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 7, 2024
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.
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #129528