Conversation
With GIT_DIFF_INCLUDE_TYPECHANGE_TREES, the diff creates a delta for an unmatched item and then takes the last delta to turn it into a typechange. When no delta is created for the item (because of the pathspec or the notify callback), the last delta belongs to another item. If that item has the same id, its delta becomes a typechange to a tree: a deleted file `a` is reported as a typechange when a file `c` with the same contents becomes the directory `c/` and the pathspec excludes `c`. Check the path of the last delta as well as the id.
This branch has not been deployed
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
1 participant
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 #7392.
diff_delta__last_for_itemreturned the last delta if the id matched, without checking that the delta was for the same path. When no delta had been created for the item (filtered out by the pathspec or skipped by the notify callback), it could pick up the previous item's delta and turn it into a typechange.This makes it compare the path as well. The new test fails without the fix.