johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(refinery): delete remote polecat branches after merge (#369)

Browse Source 
Since the self-cleaning model (Jan 10), polecats push branches to origin
before `gt done`. The refinery was only deleting local branches after
merge, causing stale `polecat/*` branches to accumulate on the remote.

Now deletes both local and remote branches after successful merge.
Uses existing `git.DeleteRemoteBranch()` function. Remote deletion is
non-fatal if the branch doesn't exist.

Fixes #359
This commit is contained in:
Bo
2026-01-12 02:08:29 -05:00
committed by GitHub
parent 1f272ffc53
commit 2a0a8c760b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/refinery/engineer.go
View File

@@ -445,13 +445,21 @@ func (e *Engineer) handleSuccess(mr *beads.Issue, result ProcessResult) {
}
}
// 4. Delete source branch if configured (local only - branches never go to origin)
// 4. Delete source branch if configured (local and remote)
// Since the self-cleaning model (Jan 10), polecats push to origin before gt done,
// so we need to clean up both local and remote branches after merge.
if e.config.DeleteMergedBranches && mrFields.Branch != "" {
if err := e.git.DeleteBranch(mrFields.Branch, true); err != nil {
_, _ = fmt.Fprintf(e.output, "[Engineer] Warning: failed to delete branch %s: %v\n", mrFields.Branch, err)
_, _ = fmt.Fprintf(e.output, "[Engineer] Warning: failed to delete local branch %s: %v\n", mrFields.Branch, err)
} else {
_, _ = fmt.Fprintf(e.output, "[Engineer] Deleted local branch: %s\n", mrFields.Branch)
}
// Also delete the remote branch (non-fatal if it doesn't exist)
if err := e.git.DeleteRemoteBranch("origin", mrFields.Branch); err != nil {
_, _ = fmt.Fprintf(e.output, "[Engineer] Warning: failed to delete remote branch %s: %v\n", mrFields.Branch, err)
} else {
_, _ = fmt.Fprintf(e.output, "[Engineer] Deleted remote branch: origin/%s\n", mrFields.Branch)
}
}
// 5. Log success