Closed
Conversation
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.
Motivation
stck syncrebase boundaries so rewritten ancestry (including squash-merge flows) yields correctgit rebase --ontoboundaries.--ontoexecution model while making boundary selection more robust against missing local refs and rewritten history.Description
gitops::derive_rebase_boundarywhich attemptsgit merge-base --fork-point(old-base candidates), thengit merge-base(old-base candidates), thengit merge-base(new-base candidates), and finally falls back to existing old-base ref resolution.resolve_old_base_for_rebasecall insyncexecution withderive_rebase_boundaryso each rebase step uses the derived boundary SHA.tests/cli_skeleton.rsto simulatemerge-base --fork-pointandmerge-basebehaviors and add regression tests for fork-point fallback, merge-base fallback, and missing-local-old-base fallback.src/gitops.rs,src/cli.rs, andtests/cli_skeleton.rsto keep the diff focused on Milestone A scope.Testing
cargo fmt --allandcargo clippy --all-targets --all-features -- -D warnings, and both completed successfully.cargo test --all-features, which ran unit tests (20 tests) and CLI/integration tests (44 tests) for a total of 64 tests and all tests passed.Codex Task