From 34cfee142362b459c0b3ca9c7f482a76166a4a49 Mon Sep 17 00:00:00 2001 From: Justin Wernick Date: Mon, 17 Jul 2023 20:08:19 +0200 Subject: Standardise main branch name used in tests --- tests/cli_test_utils/git.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/cli_test_utils/git.rs b/tests/cli_test_utils/git.rs index 99177e8..961592e 100644 --- a/tests/cli_test_utils/git.rs +++ b/tests/cli_test_utils/git.rs @@ -15,7 +15,17 @@ pub fn create_clone(c: &TestContext, repo_dir: &Path, relative_name: &str) -> Pa .timeout(std::time::Duration::from_secs(3)) .assert() .success(); - c.workdir.as_ref().join(relative_name) + + let repo_dir = c.workdir.as_ref().join(relative_name); + + // standardising the main branch of our clone simplifies things. + Command::new("git") + .args(["checkout", "-b", "main"]) + .current_dir(&repo_dir) + .assert() + .success(); + + repo_dir } pub fn create_commit(repo_dir: &Path) -> Result { -- cgit v1.2.3