From 73439c2a95fbddcb5217aefc5f0ab59d3e939013 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Tue, 4 Nov 2025 17:45:32 +0100 Subject: [PATCH] common: fix initial branch name If user has global setting init.defaultBranch set to something else than 'master' the test fails: ---- backup_subcommand stdout ---- thread 'backup_subcommand' (44196) panicked at tests/backup.rs:28:5: assertion `left == right` failed left: "main" right: "master" --- tests/common/mod.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/common/mod.rs b/tests/common/mod.rs index f243041..21308a3 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -5,7 +5,7 @@ use std::io::{self, Write}; use std::path::{Path, PathBuf}; use std::process::{Command, Output}; -use git2::{BranchType, IndexAddOption, ObjectType, Oid, Repository}; +use git2::{BranchType, IndexAddOption, ObjectType, Oid, Repository, RepositoryInitOptions}; pub fn generate_path_to_repo(repo_name: S) -> PathBuf where @@ -36,7 +36,9 @@ where fs::remove_dir_all(&path_to_repo).ok(); fs::create_dir_all(&path_to_repo).unwrap(); - let repo = match Repository::init(path_to_repo) { + let mut options = RepositoryInitOptions::new(); + options.initial_head("master"); + let repo = match Repository::init_opts(path_to_repo, &options) { Ok(repo) => repo, Err(err) => panic!("failed to init repo: {}", err), };