Skip to content

[x.py setup] Allow setting up git hooks from other worktrees - #77778

Merged
bors merged 1 commit into
rust-lang:masterfrom
jyn514:git-hook
Oct 20, 2020
Merged

[x.py setup] Allow setting up git hooks from other worktrees#77778
bors merged 1 commit into
rust-lang:masterfrom
jyn514:git-hook

Conversation

@jyn514

@jyn514jyn514 commented Oct 10, 2020

Copy link
Copy Markdown
Member

Closes#77684
r? @caass

@jyn514jyn514 added A-contributor-roadblock Area: Makes things more difficult for new or seasoned contributors to Rust 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 Oct 10, 2020
@jyn514jyn514 changed the title Allow setting up git hooks from other worktrees[x.py setup] Allow setting up git hooks from other worktreesOct 10, 2020
@jyn514

jyn514 commented Oct 16, 2020

Copy link
Copy Markdown
MemberAuthor

r? @Mark-Simulacrum

@Mark-Simulacrum

Mark-Simulacrum commented Oct 19, 2020

Copy link
Copy Markdown
Member

r=me, but I don't personally use git hooks so mostly just "seems fine". I can review in more detail if you'd like but I'll need to do more research and it'll take longer.

@jyn514

jyn514 commented Oct 19, 2020

Copy link
Copy Markdown
MemberAuthor

I think 'seems fine' is good for now, I did test locally that this works. We can always fix issues in follow-ups.

@bors r=mark-simulacrum

@bors

bors commented Oct 19, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit bd13567 has been approved by mark-simulacrum

@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 Oct 19, 2020
@JohnTitorJohnTitor mentioned this pull request Oct 20, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 20, 2020
@bors
Auto merge ofrust-lang#78127- JohnTitor:rollup-p1bxtqq, r=JohnTitor
c9b5210
Rollup of 10 pull requests
Successful merges:
- rust-lang#77612 (BTreeMap: test invariants more thoroughly and more readably)
- rust-lang#77761 (Assert that pthread mutex initialization succeeded)
- rust-lang#77778 ([x.py setup] Allow setting up git hooks from other worktrees)
- rust-lang#77838 (const keyword: brief paragraph on 'const fn')
- rust-lang#77923 ([net] apply clippy lints)
- rust-lang#77931 (Fix false positive for `unused_parens` lint)
- rust-lang#77959 (Tweak ui-tests structure)
- rust-lang#78105 (change name in .mailmap)
- rust-lang#78111 (Trait predicate ambiguities are not always in `Self`)
- rust-lang#78121 (Do not ICE on pattern that uses a binding multiple times in generator)
Failed merges:
r? `@ghost`
@bors
bors merged commit 24907f3 into rust-lang:masterOct 20, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 20, 2020
@jyn514
jyn514 deleted the git-hook branch October 20, 2020 14:00
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-SimulacrumMark-Simulacrum

Labels

A-contributor-roadblockArea: Makes things more difficult for new or seasoned contributors to RustS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)

Projects

None yet

Milestone

1.49.0

Development

Successfully merging this pull request may close these issues.

Add support for worktrees to x.py setup git hook

4 participants

@jyn514@Mark-Simulacrum@bors@rustbot