scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-10 22:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prune stale git worktrees before branch creation in WorktreeSandbox

Browse source 
Stale worktree references from deleted temp directories kept branches
locked, causing "cannot force update the branch" errors on subsequent
runs with the same branch name.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-03-31 13:44:01 -04:00
parent c64639918e
commit e3ed586691
No known key found for this signature in database
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/crates/fabro-sandbox/src/worktree.rs
View file

@ -123,6 +123,15 @@ impl Sandbox for WorktreeSandbox {
.exec_command(&rm_cmd, 30_000, None, None, None)
.await;
// Prune all stale worktree references whose directories no longer exist.
// Without this, a branch may remain locked by a worktree in a deleted
// temp directory from a previous run.
let prune_cmd = format!("{GIT} worktree prune");
let _ = self
.inner
.exec_command(&prune_cmd, 30_000, None, None, None)
.await;
if !self.config.skip_branch_creation {
let cmd = format!("{GIT} branch --force {branch} {sha}");
let result = self
@ -386,15 +395,16 @@ mod tests {
wt.initialize().await.unwrap();
let cmds = mock.captured_commands.lock().unwrap().clone();
// worktree remove (best-effort), branch --force, worktree add
assert_eq!(cmds.len(), 3, "expected 3 git commands, got: {cmds:?}");
// worktree remove (best-effort), worktree prune, branch --force, worktree add
assert_eq!(cmds.len(), 4, "expected 4 git commands, got: {cmds:?}");
assert!(
cmds[0].contains("worktree remove --force"),
"cmd[0]: {}",
cmds[0]
);
assert!(cmds[1].contains("branch --force"), "cmd[1]: {}", cmds[1]);
assert!(cmds[2].contains("worktree add"), "cmd[2]: {}", cmds[2]);
assert!(cmds[1].contains("worktree prune"), "cmd[1]: {}", cmds[1]);
assert!(cmds[2].contains("branch --force"), "cmd[2]: {}", cmds[2]);
assert!(cmds[3].contains("worktree add"), "cmd[3]: {}", cmds[3]);
}
#[tokio::test]
@ -453,14 +463,15 @@ mod tests {
wt.initialize().await.unwrap();
let cmds = mock.captured_commands.lock().unwrap().clone();
// Only worktree remove (best-effort) and worktree add
assert_eq!(cmds.len(), 2, "expected 2 git commands, got: {cmds:?}");
// worktree remove (best-effort), worktree prune, worktree add
assert_eq!(cmds.len(), 3, "expected 3 git commands, got: {cmds:?}");
assert!(
cmds[0].contains("worktree remove --force"),
"cmd[0]: {}",
cmds[0]
);
assert!(cmds[1].contains("worktree add"), "cmd[1]: {}", cmds[1]);
assert!(cmds[1].contains("worktree prune"), "cmd[1]: {}", cmds[1]);
assert!(cmds[2].contains("worktree add"), "cmd[2]: {}", cmds[2]);
}
#[tokio::test]