Repository navigation
feat(upstream): review each intake commit against its upstream source - #562
Merged
Merged
Conversation
The intake audit listed the upstream PRs a candidate imports, but not what the fork changed in each picked commit. Reviewers had to compare each commit with its upstream source by hand. The audit now has a Commits section with one entry per candidate commit, in order. Each entry links the upstream PR and any Upstream-Commit sources, quotes the Fork adaptation note, and says whether the commit changes exactly the lines its upstream sources changed. For a commit that differs, it shows the difference per file as a diff between the two lists of changed lines, capped at 80 lines, with a git range-diff command for the full comparison. It also names the fork features whose ledger paths the commit touches.
incognitojam
force-pushed
the
feat/intake-audit-commit-review
branch
from
September 30, 2026 15:41
91cf6d0 to
797e527
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Note
The intake audit now shows, for each picked commit, whether it changes exactly what its upstream source changed and, if not, how it differs.
Reviewing an intake meant opening every linked upstream PR and commit, but the audit gave no way to see what the fork changed in each commit it actually picked.
Change
The audit summary gains a Commits section, before the fork feature overlap list, with one entry per candidate commit in order:
Upstream-Committrailers. The commit cherry-picked from a linked PR is not repeated;Fork adaptationnote, quoted;git range-diffcommand for the full comparison;A commit matches when, file by file, it adds and removes the same lines as its upstream sources, ignoring line numbers and context. A conflict resolved by keeping upstream's lines around fork code therefore still matches; resolving it by changing upstream's lines does not. The runbook mentions the section.
Example
From the audit of the batch promoted as
71c9fe3f94, where 10 of 25 commits differ from their sources:Validation
aed88d07fb..71c9fe3f94: the 25 commits of that batch were each classified. The 10 marked as differing are exactly the commits with aFork adaptationnote, apart from fix(mobile): pin expo-audio so the release smoke patch stays in use pingdotgg/t3code#11426, whose note explains why it is reported as provenance only. The commits resolved by keeping fork code beside upstream's changes, such as fix(web): tighten sidebar search and footer spacing pingdotgg/t3code#11466, match. The printedgit range-diffcommands run against the listed commits. The summary is about 46 KB.mainthat the Fork CI intake job and the promotion workflow already fetch for the migration check (feat(upstream): check the upstream migration history against upstream #560). An upstream source missing from that fetch, such as an early import from an unmerged PR branch, is reported as not compared.a database migration changed: adds 51 ProjectionThreadMessageContextwithout errors, and the Commits section is unchanged.Written by an agent (Claude Code, claude-opus-5-5).