From f692cf6fd16568bf05054d5f67bd87bf075eee51 Mon Sep 17 00:00:00 2001 From: jyn Date: Wed, 31 May 2023 11:54:27 -0500 Subject: [PATCH] Fix `src/etc/pre-push.sh` when `build.locked-deps` is already set in config.toml Before, cargo would error: ``` ; git push Running pre-push script /home/jyn/src/rust/x test tidy Building bootstrap Finished dev [unoptimized] target(s) in 0.02s Build stage0 tool tidy (x86_64-unknown-linux-gnu) error: the argument '--locked' cannot be used multiple times Usage: cargo build [OPTIONS] For more information, try '--help'. Build completed unsuccessfully in 0:00:00 error: failed to push some refs to 'github.com:jyn514/rust.git' ``` --- src/etc/pre-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/etc/pre-push.sh b/src/etc/pre-push.sh index ff17931115cd0..0807e0492c113 100755 --- a/src/etc/pre-push.sh +++ b/src/etc/pre-push.sh @@ -14,4 +14,4 @@ ROOT_DIR="$(git rev-parse --show-toplevel)" echo "Running pre-push script $ROOT_DIR/x test tidy" cd "$ROOT_DIR" -CARGOFLAGS="--locked" ./x test tidy +./x test tidy --set build.locked-deps=true