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

This commit is contained in:
Huskies Agent
2026-07-21 12:10:20 +00:00
parent 22710571df
commit 8a32c1ffd8
20 changed files with 488 additions and 248 deletions
+36 -25
View File
@@ -1161,34 +1161,45 @@ fn display_section_returns_closed_for_new_terminal_variants() {
/// Initialise a bare-minimum git repo in `dir` with one commit.
fn init_git_repo(dir: &std::path::Path) {
use crate::git_test_support::git_ok;
use std::process::Command;
Command::new("git")
.args(["init", "-b", "main"])
.current_dir(dir)
.output()
.unwrap();
Command::new("git")
.args(["config", "user.email", "test@test.com"])
.current_dir(dir)
.output()
.unwrap();
Command::new("git")
.args(["config", "user.name", "Test"])
.current_dir(dir)
.output()
.unwrap();
git_ok(
Command::new("git")
.args(["init", "-b", "main"])
.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",
);
// Create an initial commit so the repo has a HEAD.
std::fs::write(dir.join("README.md"), "# test").unwrap();
Command::new("git")
.args(["add", "README.md"])
.current_dir(dir)
.output()
.unwrap();
Command::new("git")
.args(["commit", "-m", "init"])
.current_dir(dir)
.output()
.unwrap();
git_ok(
Command::new("git")
.args(["add", "README.md"])
.current_dir(dir)
.output(),
"git add",
);
git_ok(
Command::new("git")
.args(["commit", "-m", "init"])
.current_dir(dir)
.output(),
"git commit",
);
}
#[test]
+36 -25
View File
@@ -566,33 +566,44 @@ mod tests {
/// Initialise a bare-minimum git repo in `dir` with one commit.
fn init_git_repo(dir: &std::path::Path) {
use crate::git_test_support::git_ok;
use std::process::Command as Cmd;
Cmd::new("git")
.args(["init", "-b", "main"])
.current_dir(dir)
.output()
.unwrap();
Cmd::new("git")
.args(["config", "user.email", "test@test.com"])
.current_dir(dir)
.output()
.unwrap();
Cmd::new("git")
.args(["config", "user.name", "Test"])
.current_dir(dir)
.output()
.unwrap();
git_ok(
Cmd::new("git")
.args(["init", "-b", "main"])
.current_dir(dir)
.output(),
"git init",
);
git_ok(
Cmd::new("git")
.args(["config", "user.email", "test@test.com"])
.current_dir(dir)
.output(),
"git config user.email",
);
git_ok(
Cmd::new("git")
.args(["config", "user.name", "Test"])
.current_dir(dir)
.output(),
"git config user.name",
);
std::fs::write(dir.join("README.md"), "# test").unwrap();
Cmd::new("git")
.args(["add", "README.md"])
.current_dir(dir)
.output()
.unwrap();
Cmd::new("git")
.args(["commit", "-m", "init"])
.current_dir(dir)
.output()
.unwrap();
git_ok(
Cmd::new("git")
.args(["add", "README.md"])
.current_dir(dir)
.output(),
"git add",
);
git_ok(
Cmd::new("git")
.args(["commit", "-m", "init"])
.current_dir(dir)
.output(),
"git commit",
);
}
#[test]