Skip to content

Commit 0a83e43

Browse files
committed
Auto merge of rust-lang#118597 - lnicola:cargotest-no-branch, r=Mark-Simulacrum
Don't ask for a specific branch in cargotest Tentative fix for rust-lang#118592 (comment). `servo` [just renamed](servo/servo#30788) their `master` branch to `main`, but `cargotest` does a `git fetch $URL master; git reset --hard $SHA`. Let's try to change that to `git fetch $URL $SHA; git reset --hard $SHA`, which appears to work, but I can't confirm for sure because I'm having some trouble with `x.py`: ``` --> library/rustc-std-workspace-core/lib.rs:4:9 | 4 | pub use core::*; | ^^^^ | = note: the following crate versions were found: crate `core` compiled by rustc 1.76.0-nightly (85a4bd8 2023-12-04): ./build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/deps/libcore-70719e8645e6f000.rmeta = help: please recompile that crate using this compiler (rustc 1.76.0-nightly (5808b72 2023-12-04)) (consider running `cargo clean` first) ```
2 parents cf8d812 + 5808b72 commit 0a83e43

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/tools/cargotest/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
140140
let status = Command::new("git")
141141
.arg("fetch")
142142
.arg(test.repo)
143-
.arg("master")
143+
.arg(test.sha)
144144
.arg(&format!("--depth={}", depth))
145145
.current_dir(&out_dir)
146146
.status()

0 commit comments

Comments
 (0)