Skip to content

Commit 9c67e0c

Browse files
authored
Rollup merge of rust-lang#112146 - jyn514:locked-deps, r=clubby789
Fix `src/etc/pre-push.sh` when `build.locked-deps` is already set 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' ```
2 parents d4f497e + f692cf6 commit 9c67e0c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/etc/pre-push.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ ROOT_DIR="$(git rev-parse --show-toplevel)"
1414
echo "Running pre-push script $ROOT_DIR/x test tidy"
1515

1616
cd "$ROOT_DIR"
17-
CARGOFLAGS="--locked" ./x test tidy
17+
./x test tidy --set build.locked-deps=true

0 commit comments

Comments
 (0)