fix: preserve Graphite modify-into attribution - #2015
Open
svarlamov wants to merge 1 commit into
Open
Conversation
Member
Author
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
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.

Summary
Preserves AI attribution when Graphite moves uncommitted child-branch changes into a downstack branch with
gt modify --into.Root cause
Graphite first creates
graphite (temporary): staged changes, then synthesizes the rewritten downstack commit withcommit-treeandmerge-tree. Git AI attached the new attribution to the temporary commit, but normal range-diff mapping only related the old downstack commit to its replacement. Because the temporary commit was outside that rewritten range, its note was never merged into the replacement and the newly added lines became unknown.Fix
update-ref, require the old target to be an ancestor of the parent of the temporary commit.The validation is constant work and only runs for the exact Graphite temporary-commit sequence: one ancestry check and two
diff-treecalls, with no history scan or per-commit loop.Tests
gt modify --all --intoend-to-end regression.task fmttask linttask test