Preserve attribution across commit-time line reordering#1967
Open
svarlamov wants to merge 1 commit into
Open
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.

Fixes #1845
Summary
Root cause
When a formatter or import sorter reordered AI-added lines after the AI checkpoint but before commit, carryover reconciliation treated the old and new insertion positions as independent changes. The synthetic carryover snapshot duplicated the moved lines. Attribution followed those duplicate ghost lines into
INITIAL, leaving the actual committed lines untracked even though the referenced blob still existed.This is platform-independent and reproduces the macOS reports without requiring pre-v1.6 data or CRLF conversion.
Test coverage
TestRepointegration regression covering scrambled AI imports sorted before commitINITIALattributionValidation
task testtask linttask fmttask build