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

set the executable bit on pre-commit.sh #87942

Merged
merged 1 commit into from
Aug 12, 2021

Conversation

oconnor663
Copy link
Contributor

x.py setup hardlinks this file into .git/hooks. Prior to this commit,
that led to the following warning emitted by git commit:

hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.

Making the checked-in script executable fixes this issue, as the
hardlinked copy uses the same flags.

It looks like the file was originally executable, but that bit was
unset in commit b908905 of
#85305. It's possible that was
unintentional.

`x.py setup` hardlinks this file into .git/hooks. Prior to this commit,
that led to the following warning emitted by `git commit`:

    hint: The '.git/hooks/pre-commit' hook was ignored because it's not set as executable.

Making the checked-in script executable fixes this issue, as the
hardlinked copy uses the same flags.

It looks like the file was originally executable, but that bit was
unset in commit b908905 of
rust-lang#85305. It's possible that was
unintentional.
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 11, 2021
@jyn514
Copy link
Member

jyn514 commented Aug 12, 2021

@bors r+ rollup

Good catch, thank you!

@bors
Copy link
Contributor

bors commented Aug 12, 2021

📌 Commit a0103e5 has been approved by jyn514

@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 Aug 12, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#85835 (Implement Extend<(A, B)> for (Extend<A>, Extend<B>))
 - rust-lang#87671 (Warn when an escaped newline skips multiple lines)
 - rust-lang#87878 (:arrow_up: rust-analyzer)
 - rust-lang#87903 (Reduce verbosity of tracing output of  RUSTC_LOG)
 - rust-lang#87925 (Update books)
 - rust-lang#87928 (Update cargo)
 - rust-lang#87942 (set the executable bit on pre-commit.sh)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 334f09b into rust-lang:master Aug 12, 2021
@rustbot rustbot added this to the 1.56.0 milestone Aug 12, 2021
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants