fix(rebase): apply committed patch series directly onto upstream#18
Merged
Merged
Conversation
The rebase script (both before and after the 4-submodule generalization) snapshotted the *working tree* to build the replay series, assuming apply-patches.sh had run first. In CI the submodules are checked out at their pinned SHAs with no patches applied, so the snapshot was empty: the script reset to upstream and then 'git am'-ed an empty series, producing a spurious conflict on every run. The original PR #14 'conflict' was this bug, not real upstream drift. Apply patches/<submodule>/*.patch directly onto the freshly-reset upstream via git am -3 — the committed patch files are the source of truth, no working-tree dependency. Preserve the curated patch filenames on regeneration (positional, since series order is stable) so doc references and the 0001/0002 numbering don't churn. Validated locally: clean apply onto the pinned base, filename preserved, content identical.
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
1 participant
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.
What
Validation of the generalized
rebase-upstream.sh(run 26856151358) exposed a pre-existing bug that the generalization inherited: the script built its replay series by snapshotting the working tree, assumingapply-patches.shhad run first. In CI the submodules sit at their pinned SHAs with no patches applied, so the snapshot was empty (from X..X) — the script reset to upstream andgit am-ed an empty set, yielding a spurious conflict every run. The original PR #14 'conflict' was this bug, not real upstream drift.Fix
patches/<submodule>/*.patchdirectly onto the freshly-reset upstream viagit am -3. The committed patch files are the source of truth — no working-tree dependency, noapply-patches.shprerequisite.git format-patchrenames files from the commit subject (e.g.0001-metal-correctness-...→0001-metal-gate-has_simdgroup_...), churning the series and breaking the doc references / 0001-0002 numbering every rebase.Validation (local, isolated from upstream drift)
Replayed onto the pinned base (where the patch must apply cleanly) for whisper.cpp:
Clean
git am, filename preserved, regenerated content byte-identical to the committed patch (only git's index-hash abbreviation length differs).bash -nclean.After merge I'll re-run the workflow end-to-end — conflicts there will now be real upstream drift (meaningful), no longer spurious.