diff options
| -rwxr-xr-x | src/etc/pre-commit.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/etc/pre-commit.sh b/src/etc/pre-commit.sh index 5c5922a7e63..70b4e9d9908 100755 --- a/src/etc/pre-commit.sh +++ b/src/etc/pre-commit.sh @@ -7,15 +7,17 @@ set -Eeuo pipefail -ROOT_DIR="$(git rev-parse --show-toplevel)"; -COMMAND="$ROOT_DIR/x.py test tidy --bless"; +# 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" if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then COMMAND="python $COMMAND" fi -echo "Running pre-commit script '$COMMAND'"; +echo "Running pre-commit script '$COMMAND'" cd "$ROOT_DIR" -$COMMAND; +$COMMAND |