huskies: merge 1238 bug worktree tests fail on macOS: tests clobber global HOME

2026-07-21 12:10:20 +00:00
parent 22710571df
commit 8a32c1ffd8
20 changed files with 488 additions and 248 deletions
@@ -177,16 +177,32 @@ mod tests {
    use tempfile::TempDir;

    fn init_git_repo(dir: &std::path::Path) {
-        Command::new("git")
-            .args(["init"])
-            .current_dir(dir)
-            .output()
-            .expect("git init");
-        Command::new("git")
-            .args(["commit", "--allow-empty", "-m", "init"])
-            .current_dir(dir)
-            .output()
-            .expect("git commit");
+        use crate::git_test_support::git_ok;
+        git_ok(
+            Command::new("git").args(["init"]).current_dir(dir).output(),
+            "git init",
+        );
+        git_ok(
+            Command::new("git")
+                .args(["config", "user.email", "test@test.com"])
+                .current_dir(dir)
+                .output(),
+            "git config user.email",
+        );
+        git_ok(
+            Command::new("git")
+                .args(["config", "user.name", "Test"])
+                .current_dir(dir)
+                .output(),
+            "git config user.name",
+        );
+        git_ok(
+            Command::new("git")
+                .args(["commit", "--allow-empty", "-m", "init"])
+                .current_dir(dir)
+                .output(),
+            "git commit",
+        );
    }

    fn empty_config() -> ProjectConfig {