diff options
| author | Tyler Mandry <tmandry@google.com> | 2022-08-29 16:43:47 -0700 |
|---|---|---|
| committer | Tyler Mandry <tmandry@google.com> | 2022-08-29 16:46:51 -0700 |
| commit | 8873e33806487a0fb12143772b1a3c1544edbe0b (patch) | |
| tree | 6a62db0d3b178207be63fc58aebcc060f334ad4a | |
| parent | 03d488b48af9f66b91e9400387f781b82411fa82 (diff) | |
| download | rust-8873e33806487a0fb12143772b1a3c1544edbe0b.tar.gz rust-8873e33806487a0fb12143772b1a3c1544edbe0b.zip | |
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).
| -rwxr-xr-x | src/etc/pre-push.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index 5f5b48bc1c0..be7de3ebaf5 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -10,7 +10,7 @@ set -Eeuo pipefail # https://github.com/rust-lang/rust/issues/77620#issuecomment-705144570 unset GIT_DIR ROOT_DIR="$(git rev-parse --show-toplevel)" -COMMAND="$ROOT_DIR/x.py test tidy --bless" +COMMAND="$ROOT_DIR/x.py test tidy" if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then COMMAND="python $COMMAND" |