Filter out skip_worktree statuses #42
Merged
Conversation
This file contains 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
erikmchut
approved these changes
Feb 8, 2024
src/libgit2/status.c
Outdated
| size_t i; | ||
| git_diff_delta *delta; | ||
| // BLOCKME: If we like this solution, I'll look at filtering in place rather than creating a new vector | ||
| git_vector_foreach(&status->idx2wd->deltas, i, delta) { |
There was a problem hiding this comment.
This looks right to me – when a skip-worktree index entry compared to the worktree is has a deleted status, it shouldn't be considered a delta. The fix is done here, because the implementation for idx<->workdir diff is generic and used for diffs of any iterator type.
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.
Context
We were seeing unexpected behavior in sparse_checkout__reapply because there were spurious deletion statuses being reported when checking what files need to be checked out/deleted.
Testing
make libgit2_tests && ./libgit2_tests -ssparse::status -ssparse::pathspasses (with one case skipped because of case sensitivity)