Repository navigation
fix(fork): check sync merge whitespace against the upstream side only - #112
Merged
Merged
Conversation
- validate-merge diffed against both parents, so upstream's own trailing whitespace (patches/*.patch, C hex arrays) failed every real sync merge - Run the conflict-marker scan and `git diff --check` against the upstream parent only, matching verify - Test: upstream-side whitespace passes, resolution-added whitespace fails
Thread transfer impact
This comment will update automatically after the next completed run. |
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.
Traceability
Part of #110
Problem
scripts/upstream-sync.ts validate-merge(run by theUpstream Sync MergeCI job from the trusted base) rangit diff --checkand the conflict-marker scan against both merge parents. Against the fork parent, the diff contains all of upstream's incoming changes, and upstream ships files that trip--check(trailing whitespace inpatches/*.patch, a generated byte table). So the first real sync PR (#111,v0.1.9) fails validation although its resolution is clean. The runbook'sverifyalready checks against the upstream side only.Change
validateUpstreamSyncMergechecks whitespace and conflict markers against the upstream parent (the tag commit) only: exactly what the fork side (resolution plus fork delta) adds on top of upstream.Compatibility
Sync tooling only.
Verification
scripts/upstream-sync.test.ts: an upstream-added file with trailing whitespace passes; a resolution that adds trailing whitespace fails. It fails on the old code with the same error as chore(sync): merge upstream v0.1.9 #111.vp test run scripts/upstream-sync.test.ts: 68 passed; scripts typecheck, lint and fmt clean.validate-mergewith chore(sync): merge upstream v0.1.9 #111's arguments printsValidated the sync merge 875e8c5e18 of v0.1.9 (24e77473ec) onto 8ee05a30f1.Model and harness: Claude Opus 5.5 (orchestration), Claude Sonnet 5.5 (implementation), via Claude Code in T3 Code.
🤖 Generated with Claude Code