Skip to content

Don't --bless in pre-push hook - #101175

Merged
bors merged 1 commit into
rust-lang:masterfrom
tmandry:curse-push-hook
Aug 30, 2022
Merged

Don't --bless in pre-push hook#101175
bors merged 1 commit into
rust-lang:masterfrom
tmandry:curse-push-hook

Conversation

@tmandry

Copy link
Copy Markdown
Member

Running with --bless causes the push to succeed if there are fixable
formatting changes, but the changes don't make it into the push.

We should have the user rerun with --bless (or x.py fmt) and commit the
changes themselves (they might want to amend a particular commit, for
instance).

Running with --bless causes the push to succeed if there are fixable
formatting changes, but the changes don't make it into the push.
We should have the user rerun with --bless (or x.py fmt) and commit the
changes themselves (they might want to amend a particular commit, for
instance).
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 29, 2022
@tmandry

Copy link
Copy Markdown
MemberAuthor

r? @jyn514

@jyn514jyn514 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.

This makes sense to me, thanks.

@jyn514

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Aug 30, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 8873e33 has been approved by jyn514

It is now in the queue for this repository.

@borsbors 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 Aug 30, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 30, 2022
Don't --bless in pre-push hook
Running with --bless causes the push to succeed if there are fixable
formatting changes, but the changes don't make it into the push.
We should have the user rerun with --bless (or x.py fmt) and commit the
changes themselves (they might want to amend a particular commit, for
instance).
@Dylan-DPCDylan-DPC mentioned this pull request Aug 30, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 30, 2022
Rollup of 9 pull requests
Successful merges:
- rust-lang#95376 (Add `vec::Drain{,Filter}::keep_rest`)
- rust-lang#100092 (Fall back when relating two opaques by substs in MIR typeck)
- rust-lang#101019 (Suggest returning closure as `impl Fn`)
- rust-lang#101022 (Erase late bound regions before comparing types in `suggest_dereferences`)
- rust-lang#101101 (interpret: make read-pointer-as-bytes a CTFE-only error with extra information)
- rust-lang#101123 (Remove `register_attr` feature)
- rust-lang#101175 (Don't --bless in pre-push hook)
- rust-lang#101176 (rustdoc: remove unused CSS selectors for `.table-display`)
- rust-lang#101180 (Add another MaybeUninit array test with const)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 948aeff into rust-lang:masterAug 30, 2022
@rustbotrustbot added this to the 1.65.0 milestone Aug 30, 2022
@tmandry
tmandry deleted the curse-push-hook branch August 31, 2022 01:18
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 8, 2023
JohnTitor pushed a commit to JohnTitor/rust that referenced this pull request Jan 8, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@tmandry@rust-highfive@jyn514@bors@Mark-Simulacrum@rustbot