Skip to main content
← Back to list
01Issue
BugShippedSwamp CLIPublic
Assigneesstack72

Relationships

#1872 verify-reviews workflow uses local main as diff base, producing stale diffs in worktrees

Opened by stack72 · 8/27/2026· Shipped 8/27/2026

Problem

The verify-reviews workflow computes the diff using git merge-base main HEAD, but main refers to the local branch. When running from a worktree where the local main is behind origin/main, the diff includes commits that already landed upstream, causing reviewers to see phantom changes and produce false-positive findings.

Discovered during #1869 — the worktree's local main was one commit behind origin/main (missing cd3100f3), so the adversarial and code reviewers saw workflow execution and process executor changes that weren't part of the branch, generated CRITICAL/HIGH findings about non-existent regressions, and blocked verification twice.

Proposed Solution

In the verify-reviews workflow's diff step, use origin/main instead of main as the base ref, or git fetch origin main before computing the diff. The workflow already creates its own worktree — adding a fetch there ensures the diff base is always current regardless of the caller's local state.

The same fix should apply to verify-build if it computes diffs.

Impact

Without this fix, any worktree session that doesn't manually git fetch origin main && git rebase origin/main before verification will get incorrect diffs and potentially waste two full review cycles (~5 min each) on hallucinated findings.

Automoved by swampadmin from https://github.com/swamp-club/swamp/issues/2298

02Bog Flow
✓OPEN✓TRIAGED✓IN PROGRESS✓SHIPPED+ 1 MOREASSIGNED+ 2 MOREREVIEW+ 7 MOREPR_MERGED+ 2 MORESESSION_SUMMARIZED

Shipped

8/27/2026, 6:18:28 PM

Click a lifecycle step above to view its details.

03Sludge Pulse
stack72 assigned stack728/27/2026, 5:47:57 PM

Sign in to post a ripple.