utils: fix diff so subpaths work for sparse checkouts, fixes 1455 to releases/v5.x #1567
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
utils: fix diff so subpaths work for sparse checkouts, fixes 1455
There was a problem hiding this comment.
Pull Request Overview
This PR backports changes to fix subpath handling for sparse checkouts, addressing issue 1455 by ensuring diff operations respect the SkipWorktree flag correctly.
- Replace filepath with path for consistent path joining.
- Add a new test (TestDiffSkipIssue1455) to verify correct diff behavior with sparse checkouts.
- Adjust node creation and change processing logic to properly handle nodes with SkipWorktree enabled.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| utils/merkletrie/index/node_test.go | Updated tests replacing filepath with path and added TestDiffSkipIssue1455. |
| utils/merkletrie/index/node.go | Modified logic to update parent's skip flag in nested nodes. |
| utils/merkletrie/change.go | Updated condition to skip processing for directories or skipped entries. |
Comments suppressed due to low confidence (2)
utils/merkletrie/index/node_test.go:66
- Consider adding additional test cases within TestDiffSkipIssue1455 to cover scenarios with nested nodes having mixed SkipWorktree values to ensure robust behavior.
func (s *NoderSuite) TestDiffSkipIssue1455(c *C) {
utils/merkletrie/change.go:153
- Adding a brief comment explaining why current.Skip() is checked alongside current.IsDir() could improve code clarity for future maintainers.
if current.IsDir() || current.Skip() {
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.
Related issues
#1558
Description
Backport of #1484 to v5.