- Notifications
You must be signed in to change notification settings - Fork868
utils: fix diff so subpaths work for sparse checkouts, fixes 1455 to releases/v5.x#1567
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
pjbgf merged 1 commit intogo-git:releases/v5.xfromkane8n:backport-to-v5-patricsss/fix-1455Jun 6, 2025
Merged
utils: fix diff so subpaths work for sparse checkouts, fixes 1455 to releases/v5.x#1567
pjbgf merged 1 commit intogo-git:releases/v5.xfromkane8n:backport-to-v5-patricsss/fix-1455Jun 6, 2025
Uh oh!
There was an error while loading.Please reload this page.
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
Contributor
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
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() {pjbgf approved these changesJun 6, 2025
Member
pjbgf left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
@kane8n thank you for back-porting this. 🙇
ed8216c intogo-git:releases/v5.x 12 of 13 checks passed
Uh oh!
There was an error while loading.Please reload this page.
project-mirrors-bot-tubot pushed a commit to project-mirrors/forgejo-runner-as-gitea-act-runner-fork that referenced this pull requestAug 3, 2025
This PR contains the following updates:| Package | Change | Age | Confidence ||---|---|---|---|| [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | `v5.13.1` -> `v5.16.2` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) |---### Release Notes<details><summary>go-git/go-git (github.com/go-git/go-git/v5)</summary>### [`v5.16.2`](https://github.com/go-git/go-git/releases/tag/v5.16.2)[Compare Source](go-git/go-git@v5.16.1...v5.16.2)#### What's Changed- utils: fix diff so subpaths work for sparse checkouts, fixes 1455 to releases/v5.x by [@​kane8n](https://github.com/kane8n) ingo-git/go-git#1567**Full Changelog**:go-git/go-git@v5.16.1...v5.16.2### [`v5.16.1`](https://github.com/go-git/go-git/releases/tag/v5.16.1)[Compare Source](go-git/go-git@v5.16.0...v5.16.1)#### What's Changed- utils: merkletrie, Fix diff on sparse-checkout index. Fixes [#​1406](go-git/go-git#1406) to releases/v5.x by [@​kane8n](https://github.com/kane8n) ingo-git/go-git#1561#### New Contributors- [@​kane8n](https://github.com/kane8n) made their first contribution ingo-git/go-git#1561**Full Changelog**:go-git/go-git@v5.16.0...v5.16.1### [`v5.16.0`](https://github.com/go-git/go-git/releases/tag/v5.16.0)[Compare Source](go-git/go-git@v5.15.0...v5.16.0)#### What's Changed- \[v5] plumbing: support mTLS for HTTPS protocol by [@​hiddeco](https://github.com/hiddeco) ingo-git/go-git#1510- v5: plumbing: transport, Reintroduce SetHostKeyCallback. Fix [#​1514](go-git/go-git#1514) by [@​pjbgf](https://github.com/pjbgf) ingo-git/go-git#1515**Full Changelog**:go-git/go-git@v5.15.0...v5.16.0### [`v5.15.0`](https://github.com/go-git/go-git/releases/tag/v5.15.0)[Compare Source](go-git/go-git@v5.14.0...v5.15.0)#### What's Changed- plumbing: add cert auth support to `releases/v5.x` by [@​Javier-varez](https://github.com/Javier-varez) ingo-git/go-git#1482- v5: Bump dependencies by [@​pjbgf](https://github.com/pjbgf) ingo-git/go-git#1505**Full Changelog**:go-git/go-git@v5.14.0...v5.15.0### [`v5.14.0`](https://github.com/go-git/go-git/releases/tag/v5.14.0)[Compare Source](go-git/go-git@v5.13.2...v5.14.0)#### What's Changed- v5: Bump Go and dependencies to mitigate [GO-2025-3487](https://pkg.go.dev/vuln/GO-2025-3487) by [@​pjbgf](https://github.com/pjbgf) ingo-git/go-git#1436⚠️ Note that this version requires Go 1.23, due to the bump to `golang.org/x/crypto@v0.35.0` which mitigates the CVE above. User's that can't bump to Go 1.23 will need to remain on the previous v5.13.x release.**Full Changelog**:go-git/go-git@v5.13.2...v5.14.0### [`v5.13.2`](https://github.com/go-git/go-git/releases/tag/v5.13.2)[Compare Source](go-git/go-git@v5.13.1...v5.13.2)#### What's Changed- plumbing: use the correct user agent string. Fixes [#​883](go-git/go-git#883) by [@​uragirii](https://github.com/uragirii) ingo-git/go-git#1364- build: bump golang.org/x/sys from 0.28.0 to 0.29.0 in the golang-org group by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1365- build: bump the golang-org group with 2 updates by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1367- build: bump github.com/ProtonMail/go-crypto from 1.1.3 to 1.1.4 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1368- build: bump github.com/go-git/go-billy/v5 from 5.6.1 to 5.6.2 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1378- build: bump github/codeql-action from 3.28.0 to 3.28.1 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1376- build: bump github.com/elazarl/goproxy from 1.2.3 to 1.4.0 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1377- git: worktree, fix restoring dot slash files (backported to v5). Fixes [#​1176](go-git/go-git#1176) by [@​BeChris](https://github.com/BeChris) ingo-git/go-git#1361- build: bump github.com/pjbgf/sha1cd from 0.3.0 to 0.3.2 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1392- git: worktree\_status, fix adding dot slash files to working tree (backported to v5). Fixes [#​1150](go-git/go-git#1150) by [@​BeChris](https://github.com/BeChris) ingo-git/go-git#1359- build: bump github.com/ProtonMail/go-crypto from 1.1.4 to 1.1.5 by [@​dependabot](https://github.com/dependabot) ingo-git/go-git#1383**Full Changelog**:go-git/go-git@v5.13.1...v5.13.2</details>---### Configuration📅 **Schedule**: Branch creation - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC), Automerge - Between 12:00 AM and 03:59 AM ( * 0-3 * * * ) (UTC).🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.🔕 **Ignore**: Close this PR and you won't be reminded about this update again.--- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box---This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS40My41IiwidXBkYXRlZEluVmVyIjoiNDEuNDMuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->Reviewed-on:https://code.forgejo.org/forgejo/runner/pulls/800Reviewed-by: earl-warren <earl-warren@noreply.code.forgejo.org>Co-authored-by: Renovate Bot <bot@kriese.eu>Co-committed-by: Renovate Bot <bot@kriese.eu>
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
2 participants
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.