Skip to content

fix(full-loop-helper): if-form capture for gh pr merge under set -e #18750

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
marcusquinn merged 1 commit into from
Apr 13, 2026
Merged

fix(full-loop-helper): if-form capture for gh pr merge under set -e #18750

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
17 changes: 14 additions & 3 deletions .agents/scripts/full-loop-helper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,9 +947,20 @@ cmd_merge() {
# the base-branch-policy error, retry once with `--admin`. Any other
# failure is surfaced as-is (no blind --admin escalation).
print_info "Merging PR #${pr_number} in ${repo} (${merge_method})..."
local _merge_out _merge_rc
_merge_out=$(gh pr merge "$pr_number" --repo "$repo" "$merge_method" 2>&1)
_merge_rc=$?
# Capture output AND exit code under `set -e`. A bare assignment
# `_merge_out=$(failing_cmd)` triggers errexit before we reach
# `_merge_rc=$?`, so the function exits silently on the first plain-
# merge failure and the --admin fallback never runs. The if-form
# keeps both available. This is the GH#18538 follow-up to PR #18748,
# which shipped the bare-assignment form and was bug-verified
# end-to-end (the fallback only worked when run from a worktree with
# this fix applied locally before commit).
local _merge_out _merge_rc=0
if _merge_out=$(gh pr merge "$pr_number" --repo "$repo" "$merge_method" 2>&1); then
_merge_rc=0
else
_merge_rc=$?
fi
if [[ $_merge_rc -ne 0 ]]; then
printf '%s\n' "$_merge_out"
if printf '%s' "$_merge_out" | grep -qE 'base branch policy prohibits|Required status checks? (is|are) expected|At least [0-9]+ approving review'; then
Expand Down
Loading