From 5ac521c649b05b1634380ad6569d19e91914e059 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 15 Jan 2025 12:40:43 -0800
Subject: [PATCH] Fix benchsuite issue with newer versions of git

---
 benches/benchsuite/src/lib.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/benches/benchsuite/src/lib.rs b/benches/benchsuite/src/lib.rs
index 2d85584d513..8968ab7bdeb 100644
--- a/benches/benchsuite/src/lib.rs
+++ b/benches/benchsuite/src/lib.rs
@@ -125,11 +125,15 @@ impl Fixtures {
             }
         } else {
             fs::create_dir_all(&index).unwrap();
-            git("init --bare");
+            // git 2.48.0 changed the behavior of setting HEAD when doing a
+            // fetch, so let's just force it to match
+            // crates.io-index-archive's default branch. This also accounts
+            // for users who may override init.defaultBranch.
+            git("init --bare --initial-branch=main");
             git("remote add origin https://github.com/rust-lang/crates.io-index-archive");
         }
         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.