Preserve exact hunks across renames - #60
Merged
Merged
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.
Summary
distand document the fixWhy
changedFiles()discovers renames using an unscopedgit diff --name-status --find-renames, but then reconstructed each file's zero-context patch using only the destination path. Once the pathspec is restricted to the new path, Git can no longer pair the source and destination, so a renamed file is reinterpreted as a whole-file addition. That overstatesfile.hunksand can make unchanged call sites appear to be inside changed lines.The fix supplies both
previousPathandpathwhenever rename/copy metadata provides both identities. A pure rename now has no content hunks, while a rename with one edited line produces exactly that one-line hunk.Verification
npm testpassed after the fixnpm run clean && npm run buildpassedgit diff --checkpasseddist/git.*refreshed