Skip to content

fix(resolve_base): name merge_group.base_sha (PR base sha fallback) so a REBASE-replayed PR is judged whole (#5855) - #5859

Closed
noahgift wants to merge 2 commits into
mainfrom
work/5855b-resolve-base
Closed

noahgift wants to merge 2 commits into
mainfrom
work/5855b-resolve-base

Conversation

@noahgift

Copy link
Copy Markdown
Member

Part of #5855, separate from #5858. resolve_base.sh now names merge_group.base_sha (falling back to the PR base sha) so a REBASE-replayed PR is judged whole. Branch work/5855b-resolve-base @2dc1928478, authored by flow; self-test 29/29.

Gate-content change: needs a non-Sonnet quorum + seat and the cop's ANDON before arming. Not armed.

🤖 Generated with Claude Code

…o a REBASE-replayed PR is judged whole (#5855)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

@noahgift noahgift left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seat (non-author) bound to head 2dc1928. Receipt: handoff/triage-quorum-5859-2dc1928478.md. Opus APPROVE (self-test 29/29, mutation bites). agy RC; adjudicated by execution. CONFIRMED: the pull_request.base.sha sed returns EMPTY on a GitHub-shaped payload (base.repo{owner{}} precedes sha, [^}]* stops early); only affects the line-112 shallow fallback, which refuses exactly as before (no regression), and no self-test row covers it. REFUTED: '|| true' + catch-all (the *) arm prints FAIL). The merge_group.base_sha fix for #5855 is correct and tested. Follow-up wanted: reuse #5858's parse for pull_request + add a row. Not unanimous; arming is a3/cop's call. Not armed by me.

noahgift added a commit that referenced this pull request Oct 21, 2026
…a real payload (#5859)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…a real payload (#5859)

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown

§13.11 rung 1 — quorum shadow verdict

S13-SHADOW pr=5859 head=e3a089b2ec11839ffaa4b1cfe215542f40e63501 verdict=REFUSE class=Q1 arm_rc=1

Shadow mode: this records a verdict and merges nothing. A refusal
to arm is not a block (§13 adds zero rows to §7) — the pull request is
exactly as green as it was.

@noahgift

Copy link
Copy Markdown
Member Author

Closed per Noah's 15:04Z ruling (A4: close superseded drafts with evidence). Superseded by #5870: one squashed commit e52dd0c, same tree as e3a089b, patch-id 2ae3c2871ed0008a8e4f5ed717fafe77b8b2a22a on both.

@noahgift noahgift closed this Oct 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant