Fix benchsuite issue with newer versions of git

ehuss · ehuss · commit 14f34e1eb29b · 2025-01-15T12:48:42.000-08:00
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -127,9 +127,12 @@ impl Fixtures {`
`127`	`127`	`fs::create_dir_all(&index).unwrap();`
`128`	`128`	`git("init --bare");`
`129`	`129`	`git("remote add origin https://github.com/rust-lang/crates.io-index-archive");`
	`130`	`+ // git 2.48.0 changed the behavior of setting HEAD, so let's just`
	`131`	`+ // force it to match crates.io-index-archive's default branch.`
	`132`	`+ git("symbolic-ref HEAD refs/heads/main");`
`130`	`133`	`}`
`131`	`134`	`git(&format!("fetch origin {}", CRATES_IO_COMMIT));`
`132`		`- git("branch -f master FETCH_HEAD");`
	`135`	`+ git("branch -f main FETCH_HEAD");`
`133`	`136`	`}`
`134`	`137`
`135`	`138`	`/// This unpacks the compressed workspace skeletons into tmp/workspaces.`