From 14f34e1eb29b580b9c2d3c7cf97490c1b4553e53 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 15 Jan 2025 12:40:43 -0800 Subject: [PATCH] Fix benchsuite issue with newer versions of git --- benches/benchsuite/src/lib.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/benches/benchsuite/src/lib.rs b/benches/benchsuite/src/lib.rs index 2d85584d5137..473485d29e80 100644 --- a/benches/benchsuite/src/lib.rs +++ b/benches/benchsuite/src/lib.rs @@ -127,9 +127,12 @@ impl Fixtures { fs::create_dir_all(&index).unwrap(); git("init --bare"); git("remote add origin https://github.com/rust-lang/crates.io-index-archive"); + // git 2.48.0 changed the behavior of setting HEAD, so let's just + // force it to match crates.io-index-archive's default branch. + git("symbolic-ref HEAD refs/heads/main"); } git(&format!("fetch origin {}", CRATES_IO_COMMIT)); - git("branch -f master FETCH_HEAD"); + git("branch -f main FETCH_HEAD"); } /// This unpacks the compressed workspace skeletons into tmp/workspaces.