diff options
| author | nils <48135649+Nilstrieb@users.noreply.github.com> | 2022-12-23 18:02:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 18:02:13 +0100 |
| commit | 85d39ba646ffc6fd8a881cc770909ebca9ec43ed (patch) | |
| tree | 39a3a447ddf846f186fad272139cd072ccf8ee3c /src | |
| parent | fd5af8cc233cb70a776fd9653b11be7c56fdf78d (diff) | |
| parent | c754d057a67bb8779789ad48708632fcf87361b1 (diff) | |
| download | rust-85d39ba646ffc6fd8a881cc770909ebca9ec43ed.tar.gz rust-85d39ba646ffc6fd8a881cc770909ebca9ec43ed.zip | |
Rollup merge of #105853 - jyn514:prepush-windows, r=Mark-Simulacrum
Make the pre-push script work on directories with spaces As a secondary benefit, it's also a lot simpler. cc `@caass` - would love to have a review if you have time :)
Diffstat (limited to 'src')
| -rwxr-xr-x | src/etc/pre-push.sh | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index be7de3ebaf5..2a3086338b4 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -10,16 +10,8 @@ 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" -if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "win32" ]]; then - COMMAND="python $COMMAND" -elif ! command -v python &> /dev/null; then - COMMAND="python3 $COMMAND" -fi - -echo "Running pre-push script '$COMMAND'" +echo "Running pre-push script $ROOT_DIR/x test tidy" cd "$ROOT_DIR" - -$COMMAND +./x test tidy |