huskies: merge 967
This commit is contained in:
@@ -839,6 +839,21 @@ mod tests {
|
||||
"[[agent]]\nname = \"mergemaster\"\nstage = \"mergemaster\"\n",
|
||||
)
|
||||
.unwrap();
|
||||
// The spawn path calls `git worktree add` — the tempdir must be a real
|
||||
// git repo with at least one commit or it fails with "not a git repo".
|
||||
for args in [
|
||||
&["init"][..],
|
||||
&["config", "user.email", "test@test.com"],
|
||||
&["config", "user.name", "Test"],
|
||||
&["commit", "--allow-empty", "-m", "init"],
|
||||
] {
|
||||
std::process::Command::new("git")
|
||||
.args(args)
|
||||
.current_dir(&root)
|
||||
.output()
|
||||
.unwrap();
|
||||
}
|
||||
|
||||
crate::crdt_state::init_for_test();
|
||||
crate::db::ensure_content_store();
|
||||
crate::db::write_item_with_content(
|
||||
|
||||
Reference in New Issue
Block a user