Skip to content

feat(drone): fix merge_plugin: worktree branch-cleanup failure treated as non-fatal warning #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AIOSAI merged 1 commit into from
Apr 15, 2026
Merged

feat(drone): fix merge_plugin: worktree branch-cleanup failure treated as non-fatal warning #286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/aipass/drone/apps/plugins/devpulse_ops/merge_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,21 @@ def merge_pr(pr_number: str, caller: str) -> dict:
capture_output=True, text=True, cwd=str(repo_root),
)
if merge.returncode != 0:
result["message"] = f"Merge failed: {merge.stderr.strip()}"
logger.error(result["message"])
return result
merge_stderr = merge.stderr.strip()
# gh pr merge --delete-branch fails with non-zero if the local branch
# can't be deleted (e.g. checked out in a worktree). The GitHub-side
# merge + remote branch deletion already completed — only local
# cleanup failed. Treat this as a warning and continue.
if "cannot delete branch" in merge_stderr and "worktree" in merge_stderr:
logger.warning(
"merge_pr: PR #%s merged but local branch cleanup skipped "
"(branch in use by worktree): %s",
pr_number, merge_stderr,
)
else:
result["message"] = f"Merge failed: {merge_stderr}"
logger.error(result["message"])
return result

# Step 2: Sync local main
pull = subprocess.run(
Expand Down
Loading