utils: merkletrie, Fix diff on sparse-checkout index. Fixes #1406 to releases/v5.x#1561
Merged
pjbgf merged 1 commit intogo-git:releases/v5.xfrom Jun 4, 2025
Conversation
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR backports a fix for the sparse-checkout index issue to v5.x by introducing additional tests and modifying the merkletrie diff logic.
- Added a new test for sparse checkout in worktree_test.go.
- Updated diff handling in utils/merkletrie/difftree.go to adjust node processing when Skip() is true.
- Modified the recursive change addition in utils/merkletrie/change.go to conditionally skip changes for non-directory nodes.
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| worktree_test.go | Introduces a new test covering sparse checkout behavior. |
| utils/merkletrie/difftree.go | Adjusts diff logic by using a switch-case for handling Skip() conditions. |
| utils/merkletrie/change.go | Adds a check to prevent adding changes for nodes flagged with Skip(). |
Comment on lines
+320
to
+326
| case from.Skip(): | ||
| if from.Name() == to.Name() { | ||
| err = ii.nextBoth() | ||
| } else { | ||
| err = ii.nextFrom() | ||
| } | ||
| break | ||
| } | ||
| if to.Skip() { | ||
| if err = ret.AddRecursiveDelete(to); err != nil { | ||
| return nil, err | ||
| } | ||
| if err := ii.nextBoth(); err != nil { | ||
| return nil, err | ||
| case to.Skip(): |
There was a problem hiding this comment.
[nitpick] The new switch-case for handling skipped nodes increases the control flow complexity; consider adding inline comments to clearly explain why deletion is bypassed when node names differ.
Comment on lines
133
to
+135
| if !root.IsDir() { | ||
| l.Add(ctor(root)) | ||
| if !root.Skip() { | ||
| l.Add(ctor(root)) |
There was a problem hiding this comment.
[nitpick] While introducing a check for Skip() improves consistency, verify that this additional condition does not omit required changes for non-directory nodes in all scenarios.
Suggested change
| if !root.IsDir() { | |
| l.Add(ctor(root)) | |
| if !root.Skip() { | |
| l.Add(ctor(root)) | |
| if !root.IsDir() { | |
| // Ensure that Skip() is only applied to nodes that are explicitly meant to be skipped. | |
| // This prevents omitting required changes for valid non-directory nodes. | |
| if !root.Skip() { | |
| l.Add(ctor(root)) | |
| } else { | |
| // Log or handle cases where Skip() excludes a node, if necessary. | |
| fmt.Printf("Node skipped: %s\n", root.String()) |
utils: merkletrie, Fix diff on sparse-checkout index. Fixes go-git#1406
29a92a7 to
c3c8410
Compare
project-mirrors-bot-tu bot
pushed a commit
to project-mirrors/forgejo-runner-as-gitea-act-runner-fork
that referenced
this pull request
Aug 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) in go-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) in go-git/go-git#1561 #### New Contributors - [@​kane8n](https://github.com/kane8n) made their first contribution in go-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) in go-git/go-git#1510 - v5: plumbing: transport, Reintroduce SetHostKeyCallback. Fix [#​1514](go-git/go-git#1514) by [@​pjbgf](https://github.com/pjbgf) in go-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) in go-git/go-git#1482 - v5: Bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-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) in go-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) in go-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) in go-git/go-git#1365 - build: bump the golang-org group with 2 updates by [@​dependabot](https://github.com/dependabot) in go-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) in go-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) in go-git/go-git#1378 - build: bump github/codeql-action from 3.28.0 to 3.28.1 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#1376 - build: bump github.com/elazarl/goproxy from 1.2.3 to 1.4.0 by [@​dependabot](https://github.com/dependabot) in go-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) in go-git/go-git#1361 - build: bump github.com/pjbgf/sha1cd from 0.3.0 to 0.3.2 by [@​dependabot](https://github.com/dependabot) in go-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) in go-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) in go-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/800 Reviewed-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>
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
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 #1492 to v5.