Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix benchsuite issue with newer versions of git #15069

Merged
merged 1 commit into from
Jan 15, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions benches/benchsuite/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading