Skip to content

fix(resolve_base): name merge_group.base_sha and pull_request.base.sha (re-cut of #5859 as ONE commit) - #5870

Closed
noahgift wants to merge 1 commit into
mainfrom
work/5855c-resolve-base-1c
Closed

noahgift wants to merge 1 commit into
mainfrom
work/5855c-resolve-base-1c

Conversation

@noahgift

Copy link
Copy Markdown
Member

Re-cut of #5859 as one squashed commit (REBASE-MQ kick shape, #5802). Same tree as e3a089b; patch-id both 2ae3c2871ed0008a8e4f5ed717fafe77b8b2a22a. Refs #5855, #5859.

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

🤖 Generated with Claude Code

…a so a REBASE-replayed PR is judged whole (Refs #5855, #5859)

Squash of #5859's two commits (2dc1928, e3a089b), same tree. The pull_request fallback reads base.sha past the nested repo/user objects of a real payload.

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 e52dd0c. Receipt: handoff/triage-quorum-5870-e52dd0c3ab.md. Opus (executed) + agy unanimous APPROVE. Executed: --self-test rc0 30/30; row 24 (pull_request real nested payload -> base.sha, not head.sha) FAILs with the old sed (mutant, restored), rows 22/23 prove merge_group.base_sha and the mutation. Opus ran the awk on 16 payloads under gawk and mawk. Non-blocking follow-ups: anchor the awk on "pull_request":{ and stop at the end of base (an 'edited' payload could return head.sha, unreachable with default types); pull_request in a shallow merge checkout may now take the merge commit's first parent as base (more accurate, not vacuous); stale 'Parsed with sed' comment. Not armed by me.

@github-actions

Copy link
Copy Markdown

§13.11 rung 1 — quorum shadow verdict

S13-SHADOW pr=5870 head=e52dd0c3ab1cb36aaf8ac02a9f9621b609791364 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
noahgift marked this pull request as draft October 22, 2026 05:14
@noahgift

Copy link
Copy Markdown
Member Author

superseded by #5927 (EMG-001 epic build-speed; this ticket's commit is in its range)

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