Revert "warn_old_master_branch" check by onur-ozkan · Pull Request #131331 · rust-lang/rust (original) (raw)
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 andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Conversation3 Commits2 Checks6 Files changed
Conversation
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
[ Show hidden characters]({{ revealButtonHref }})
…old-upstream-worktree, r=albertlarsan68"
This reverts commit 507c05b, reversing changes made to 0609062.
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
Status: Awaiting review from the assignee but also interested parties.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
labels
…warning, r=albertlarsan68"
This reverts commit 776187d, reversing changes made to 7d01557.
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+
📌 Commit 1e5c4cb has been approved by Kobzol
It is now in the queue for this repository.
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
bors added a commit to rust-lang-ci/rust that referenced this pull request
…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_optionmethod)
r? @ghost
@rustbot modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
tgross35 added a commit to tgross35/rust that referenced this pull request
force "HEAD" for non-CI and git_upstream_merge_base for CI environment
When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use git_upstream_merge_base to correctly track modified files as bors commits may be in HEAD but not yet on the upstream remote.
This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
tgross35 added a commit to tgross35/rust that referenced this pull request
force "HEAD" for non-CI and git_upstream_merge_base for CI environment
When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use git_upstream_merge_base to correctly track modified files as bors commits may be in HEAD but not yet on the upstream remote.
This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request
Rollup merge of rust-lang#131358 - onur-ozkan:129528, r=Mark-Simulacrum
force "HEAD" for non-CI and git_upstream_merge_base for CI environment
When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use git_upstream_merge_base to correctly track modified files as bors commits may be in HEAD but not yet on the upstream remote.
This is also an alternative fix for rust-lang#129528 since rust-lang#131331 reverts the previous fix attempts.
RalfJung pushed a commit to RalfJung/miri that referenced this pull request
force "HEAD" for non-CI and git_upstream_merge_base for CI environment
When rust-lang/rust is configured as remote, some of the git logic (for tracking changed files) that uses get_closest_merge_commit starts to produce annoying results as the upstream branch becomes outdated quickly (since it isn't updated with git pull). We can rely on HEAD for non-CI environments as we specifically treat bors commits as merge commits, which also exist on upstream. As for CI environments, we should use git_upstream_merge_base to correctly track modified files as bors commits may be in HEAD but not yet on the upstream remote.
This is also an alternative fix for rust-lang/rust#129528 since rust-lang/rust#131331 reverts the previous fix attempts.
flip1995 pushed a commit to flip1995/rust that referenced this pull request
…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_optionmethod)
r? @ghost
@rustbot modify labels: rollup
Labels
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)