diff options
| author | Yuki Okushi <huyuumi.dev+love@gmail.com> | 2023-01-08 17:01:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-08 17:01:47 +0900 |
| commit | 3edc7e0414cab18416752f5c6952ee4b67ec9613 (patch) | |
| tree | 8590f9ac01a0543e5ce1204843d08a2e15c7e4f4 /src | |
| parent | fe075319e6d21ffce8978b8861de1f8b34cd7bcc (diff) | |
| parent | 8f80a23c252d08d83083b79036ee7199d3164eb9 (diff) | |
| download | rust-3edc7e0414cab18416752f5c6952ee4b67ec9613.tar.gz rust-3edc7e0414cab18416752f5c6952ee4b67ec9613.zip | |
Rollup merge of #106457 - kadiwa4:no-bless, r=Mark-Simulacrum
Adjust comments about pre-push.sh hook Follow-up to #101175.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/setup.rs | 4 | ||||
| -rwxr-xr-x | src/etc/pre-push.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/setup.rs b/src/bootstrap/setup.rs index cd360cbef96..ca4feac6fac 100644 --- a/src/bootstrap/setup.rs +++ b/src/bootstrap/setup.rs @@ -351,7 +351,7 @@ pub fn interactive_path() -> io::Result<Profile> { Ok(template) } -// install a git hook to automatically run tidy --bless, if they want +// install a git hook to automatically run tidy, if they want fn install_git_hook_maybe(config: &Config) -> io::Result<()> { let git = t!(config.git().args(&["rev-parse", "--git-common-dir"]).output().map(|output| { assert!(output.status.success(), "failed to run `git`"); @@ -367,7 +367,7 @@ fn install_git_hook_maybe(config: &Config) -> io::Result<()> { println!(); println!( "Rust's CI will automatically fail if it doesn't pass `tidy`, the internal tool for ensuring code quality. -If you'd like, x.py can install a git hook for you that will automatically run `tidy --bless` before +If you'd like, x.py can install a git hook for you that will automatically run `test tidy` before pushing your code to ensure your code is up to par. If you decide later that this behavior is undesirable, simply delete the `pre-push` file from .git/hooks." ); diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index 2a3086338b4..7a846d44ad6 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Call `tidy --bless` before git push +# Call `tidy` before git push # Copy this script to .git/hooks to activate, # and remove it from .git/hooks to deactivate. # |