Skip to content

Commit

Permalink
Rollup merge of rust-lang#101175 - tmandry:curse-push-hook, r=jyn514
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
matthiaskrgr committed Aug 30, 2022
2 parents d9ca6d9 + 8873e33 commit 8197f6d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/etc/pre-push.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 8197f6d

Please sign in to comment.