feat: pre-flight validation before rebase operations#1
Closed
dezren39 wants to merge 4 commits into
Closed
Conversation
This was referenced Apr 12, 2026
…ng, needs-restack-only)
e226888 to
3673f32
Compare
This was referenced Apr 13, 2026
Open
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.
Adds pre-flight checks before rebase operations (restack, sync, move) to detect conditions that would cause silent history corruption.
Changes
preflightmodule — sharedcheck_all,check_single,report_and_check,summarygit rev-list --mergesblocks rebase unless--forcegit cherryskips rebase when all commits already upstreamis_ancestorcheck catches out-of-band rebasesez restack --force— new flag to override preflight blocksez move --force— new flag, replaces inline stale check with full preflightez sync— preflight wired into restack phase with redundant skip + safe rebase modeCommits (4)
6303758feat: add pre-flight validation before rebase operations7ddf9c1feat: wire preflight into sync and move, add --force to move8cd35b2feat: emit preflight summary receipts from restack and sync3673f32test: add preflight report edge cases (empty summary, combined blocking, needs-restack-only)Resolves rohoswagger#16
Stack (this PR is 2 of 5):