diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-08-30 11:26:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-30 11:26:53 +0530 |
| commit | 948aeff52173c8bae8e7b3f61e2ecd2d08856626 (patch) | |
| tree | 13d7acdb4c160c8cbbae9134352777237c5114ff | |
| parent | c18292f6a3d97d51f8a1950fa121d4f0a4c52f19 (diff) | |
| parent | 8873e33806487a0fb12143772b1a3c1544edbe0b (diff) | |
| download | rust-948aeff52173c8bae8e7b3f61e2ecd2d08856626.tar.gz rust-948aeff52173c8bae8e7b3f61e2ecd2d08856626.zip | |
Rollup merge of #101175 - tmandry:curse-push-hook, r=jyn514
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" |