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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
worktree.Status()
not respecting .gitignore
#500
Comments
cc - @mcuadros |
I was trying to follow along here because I had a similar theory. package main
import "fmt"
func recurse(a []string) []string {
if len(a) == 3 {
return a
}
return recurse(append(a, "test"))
}
func main() {
a := []string{"a"}
b := recurse(a)
fmt.Println(a, b)
} My assumption was that because Go slices are pass-by-value that
The return value of append will be a slice that points to the newly allocated array. |
Please check this issue golang/go#52152 for examples. |
As suggested in the issue golang/go#52152 there is nothing that can be done from the go side. |
@acumino , I have no association with this repo, but I think a PR would be welcome. Do you have a fork with your copy-based workaround? I've run into the issue where there's a large directory (~300M of contents) that is in the .gitignore file. The worktree.Status() call takes anywhere from 1.6s (with repeated calls so that the kernel is caching the directory contents I'm guessing), to 15s, For comparison, the I'm guessing respecting the .gitignore would be a non-trivial performance improvement. |
@acumino another issue I spot on |
plumbing: gitignore, fix incorrect parsing. Fixes #500
Signed-off-by: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
Fix of - go-git/go-git#500
* Remove deprecated `AnalyzerPlugin` * Update go-apidiff Fix of - go-git/go-git#500 * Update skaffold
* Remove deprecated `AnalyzerPlugin` * Update go-apidiff Fix of - go-git/go-git#500 * Update skaffold
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) | require | minor | `v5.4.2` -> `v5.8.1` | --- ### ⚠ Dependency Lookup Warnings ⚠ Warnings were logged while processing this repo. Please check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>go-git/go-git (github.com/go-git/go-git/v5)</summary> ### [`v5.8.1`](https://github.com/go-git/go-git/releases/tag/v5.8.1) [Compare Source](go-git/go-git@v5.8.0...v5.8.1) #### What's Changed - \*: Bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#815 **Full Changelog**: go-git/go-git@v5.8.0...v5.8.1 ### [`v5.8.0`](https://github.com/go-git/go-git/releases/tag/v5.8.0) [Compare Source](go-git/go-git@v5.7.0...v5.8.0) #### What's Changed - git: Fix fetching after shallow clone. Fixes [#​305](go-git/go-git#305) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#778 - git: enable fetch with unqualified references by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#762 - git: don't add to want if exists, shallow and depth 1 by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#763 - git: Clone HEAD should not force master. Fixes [#​363](go-git/go-git#363) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#758 - git: fix the issue with submodules having the SCP style URL fail due to the wrong URL parsing by [@​matejrisek](https://github.com/matejrisek) in go-git/go-git#756 - git: add a clone option to allow for shallow cloning of submodules by [@​matejrisek](https://github.com/matejrisek) in go-git/go-git#765 - worktree: minor speedup for `doAddDirectory` by [@​ThinkChaos](https://github.com/ThinkChaos) in go-git/go-git#702 - \_examples: Remove wrong comment by [@​pascal-hofmann](https://github.com/pascal-hofmann) in go-git/go-git#357 - \*: Handle paths starting with tilde by [@​ricci2511](https://github.com/ricci2511) in go-git/go-git#808 - \*: Handle paths starting with ~Username by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#809 - storage: filesystem/dotgit, add support for tmp_objdir prefix by [@​L11R](https://github.com/L11R) in go-git/go-git#812 - plumbing: gitignore, replace user dir in path by [@​Jleagle](https://github.com/Jleagle) in go-git/go-git#772 - plumbing: gitignore, fix incorrect parsing. Fixes [#​500](go-git/go-git#500) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#781 - plumbing: http, Fix empty repos on Git v2.41+ by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#802 - plumbing: packp, A request is not empty if it contains shallows. Fixes [#​328](go-git/go-git#328) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#792 - plumbing: blame, Complete rewrite. Fixes [#​603](go-git/go-git#603) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#789 - plumbing: gitignore, Allow gitconfig to contain a gitignore relative to any user home. Fixes [#​578](go-git/go-git#578) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#785 #### New Contributors - [@​Jleagle](https://github.com/Jleagle) made their first contribution in go-git/go-git#772 - [@​pascal-hofmann](https://github.com/pascal-hofmann) made their first contribution in go-git/go-git#357 - [@​ricci2511](https://github.com/ricci2511) made their first contribution in go-git/go-git#808 - [@​L11R](https://github.com/L11R) made their first contribution in go-git/go-git#812 **Full Changelog**: go-git/go-git@v5.7.0...v5.7.1 ### [`v5.7.0`](https://github.com/go-git/go-git/releases/tag/v5.7.0) [Compare Source](go-git/go-git@v5.6.1...v5.7.0) #### What's Changed - \*: Add support for initializing SHA256 repositories by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#707 - git: add mirror clone option by [@​aymanbagabas](https://github.com/aymanbagabas) in go-git/go-git#735 - git: Add support to ls-remote with peeled references. Fixes [#​749](go-git/go-git#749) by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#750 - git: fix cloning with branch name by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#755 - git: Worktree, add check to see if file already checked in. Fixes [#​718](go-git/go-git#718) by [@​cbbm142](https://github.com/cbbm142) in go-git/go-git#719 - git: Worktree, git grep bare repositories by [@​aymanbagabas](https://github.com/aymanbagabas) in go-git/go-git#728 - git: Add Depth to SubmoduleUpdateOptions by [@​matejrisek](https://github.com/matejrisek) in go-git/go-git#754 - git: Testing, Fix tests not cleaning temp folders by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#769 - git: remote, add support for a configurable timeout. by [@​andrewpollock](https://github.com/andrewpollock) in go-git/go-git#753 - git: Allow Initial Branch to be configurable by [@​techknowlogick](https://github.com/techknowlogick) in go-git/go-git#764 - storage: filesystem/dotgit, Improve load packed-refs by [@​fcharlie](https://github.com/fcharlie) in go-git/go-git#743 - storage: filesystem, Populate index before use. Fixes [#​148](go-git/go-git#148) by [@​AriehSchneier](https://github.com/AriehSchneier) in go-git/go-git#722 - plumbing: resolve non-external delta references by [@​ZauberNerd](https://github.com/ZauberNerd) in go-git/go-git#485 - plumbing/transport: fix regression in scp-like match by [@​jotadrilo](https://github.com/jotadrilo) in go-git/go-git#715 - plumbing/transport: Add support for custom proxy settings by [@​aryan9600](https://github.com/aryan9600) in go-git/go-git#744 - \*: small fixes across the codebase by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#770 - \*: bump github.com/cloudflare/circl from 1.1.0 to 1.3.3 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#776 - \*: bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#748 - \*: bump Go version to 1.18 on go.mod by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#774 - \*: add Codeql workflow and bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#775 - ci: fix upstream git build for master branch by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#739 #### New Contributors - [@​ZauberNerd](https://github.com/ZauberNerd) made their first contribution in go-git/go-git#485 - [@​jotadrilo](https://github.com/jotadrilo) made their first contribution in go-git/go-git#715 - [@​fcharlie](https://github.com/fcharlie) made their first contribution in go-git/go-git#743 - [@​AriehSchneier](https://github.com/AriehSchneier) made their first contribution in go-git/go-git#755 - [@​cbbm142](https://github.com/cbbm142) made their first contribution in go-git/go-git#719 - [@​aryan9600](https://github.com/aryan9600) made their first contribution in go-git/go-git#744 - [@​matejrisek](https://github.com/matejrisek) made their first contribution in go-git/go-git#754 - [@​andrewpollock](https://github.com/andrewpollock) made their first contribution in go-git/go-git#753 - [@​techknowlogick](https://github.com/techknowlogick) made their first contribution in go-git/go-git#764 **Full Changelog**: go-git/go-git@v5.6.1...v5.7.0 ### [`v5.6.1`](https://github.com/go-git/go-git/releases/tag/v5.6.1) [Compare Source](go-git/go-git@v5.6.0...v5.6.1) #### What's Changed - plumbing/transport: don't use the `firstErrLine` when it is empty by [@​ThinkChaos](https://github.com/ThinkChaos) in go-git/go-git#682 - plumbing/transport: ssh, unable to pass a custom HostKeyCallback func by [@​aymanbagabas](https://github.com/aymanbagabas) in go-git/go-git#655 - storage/filesystem: dotgit: fix a filesystem race in Refs/walkReferencesTree by [@​MichaelMure](https://github.com/MichaelMure) in go-git/go-git#659 - \*: bump golang.org/x/net from 0.2.0 to 0.7.0 by [@​dependabot](https://github.com/dependabot) in go-git/go-git#684 - \*: bump dependencies by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#697 - \*: fix panic for empty revisions by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#696 - ci: bump GitHub actions, enable go test race detection and stop using developer's GPG keys during test execution by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#701 **Full Changelog**: go-git/go-git@v5.6.0...v5.6.1 ### [`v5.6.0`](https://github.com/go-git/go-git/releases/tag/v5.6.0) [Compare Source](go-git/go-git@v5.5.2...v5.6.0) #### What's Changed - Worktree, check for empty parent dirs during Reset (Fixes [#​670](go-git/go-git#670)) by [@​mbohy](https://github.com/mbohy) in go-git/go-git#671 - \*: remove need to build with CGO by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#688 - plumbing: support SSH/X509 signed tags by [@​hiddeco](https://github.com/hiddeco) in go-git/go-git#690 **Full Changelog**: go-git/go-git@v5.5.2...v5.6.0 ### [`v5.5.2`](https://github.com/go-git/go-git/releases/tag/v5.5.2) [Compare Source](go-git/go-git@v5.5.1...v5.5.2) #### What's Changed - \*: update go-billy v5.4.0, removes data races. Fixes [#​629](go-git/go-git#629) by [@​mcuadros](https://github.com/mcuadros) in go-git/go-git#653 - Worktree: Add, fix add removed files. Fixes [#​223](go-git/go-git#223) by [@​tfujiwar](https://github.com/tfujiwar) in go-git/go-git#652 **Full Changelog**: go-git/go-git@v5.5.1...v5.5.2 ### [`v5.5.1`](https://github.com/go-git/go-git/releases/tag/v5.5.1) [Compare Source](go-git/go-git@v5.5.0...v5.5.1) #### What's Changed - \*: fix error when building with `CGO_ENABLED=0` by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#625 - plumbing: transport/ssh: fix panic on Windows 10 with paegent as ssh-agent by [@​doxsch](https://github.com/doxsch) in go-git/go-git#617 - CommitOptions: AllowEmptyCommits, return an error instead of creating empty commits by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#623 **Full Changelog**: go-git/go-git@v5.5.0...v5.5.1 ### [`v5.5.0`](https://github.com/go-git/go-git/releases/tag/v5.5.0) [Compare Source](go-git/go-git@v5.4.2...v5.5.0) #### What's Changed - \*: add collision resistent SHA1 implementation by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#618 - \*: replace go-homedir with os.UserHomeDir by [@​mvdan](https://github.com/mvdan) in go-git/go-git#535 - Remote: add RemoteURL to {Fetch,Pull,Push}Options by [@​noerw](https://github.com/noerw) in go-git/go-git#375 - Remote: Push, add support to push commits per hashes by [@​tjamet](https://github.com/tjamet) in go-git/go-git#325 - Remote: Push, add ForceWithLease Push Option by [@​john-cai](https://github.com/john-cai) in go-git/go-git#404 - Remote: PushOptions add push-options by [@​S-Bohn](https://github.com/S-Bohn) in go-git/go-git#399 - Remote: Push, add atomic to push options by [@​john-cai](https://github.com/john-cai) in go-git/go-git#406 - Remote: add FollowTags option for pushes by [@​john-cai](https://github.com/john-cai) in go-git/go-git#385 - Worktree: use syscall.Timespec.Unix by [@​tklauser](https://github.com/tklauser) in go-git/go-git#437 - Worktree: Checkout, simplified sparse checkout by [@​john-cai](https://github.com/john-cai) in go-git/go-git#410 - Repository: don't crash accessing invalid pathinfo by [@​muesli](https://github.com/muesli) in go-git/go-git#443 - storage: filesystem, switch from os.SEEK_\* to io.Seek\* by [@​abhinav](https://github.com/abhinav) in go-git/go-git#421 - config: add branch description support by [@​ninedraft](https://github.com/ninedraft) in go-git/go-git#409 - revision: fix endless looping in revision parser by [@​michenriksen](https://github.com/michenriksen) in go-git/go-git#475 - pumbling: optimise zlib reader and consolidate sync.Pools by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#608 - pumbling: parse optimisations by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#602 - plumbing: object, rename calculation uses too much memory by [@​jfontan](https://github.com/jfontan) in go-git/go-git#503 - plumbing: protocol/pakp and server, include the contents of `GO_GIT_USER_AGENT_EXTRA`. Fixes [#​529](go-git/go-git#529) by [@​stewing](https://github.com/stewing) in go-git/go-git#531 - plumbing: protocol/pakp, avoid duplicate encoding when overriding a Capability value. by [@​tylerchr](https://github.com/tylerchr) in go-git/go-git#521 - plumbing: protocol/pakp, update agent by [@​caarlos0](https://github.com/caarlos0) in go-git/go-git#453 - plumbing: protocol/pakp: Actions should have type Action by [@​abhinav](https://github.com/abhinav) in go-git/go-git#420 - plumbing: protocol/pakp: allow unsupported `multi_ack` capability by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#613 - plumbing: transport/ssh, auto-populate HostKeyAlgorithms. Fixes [#​411](go-git/go-git#411) by [@​evanelias](https://github.com/evanelias) in go-git/go-git#548 - pumbling: format/packfile, resolve external reference delta by [@​ga-paul-t](https://github.com/ga-paul-t) in go-git/go-git#392 - plumbing: format/packfile, prevent large objects from being read into memory completely by [@​zeripath](https://github.com/zeripath) in go-git/go-git#330 - plumbing: format/index, support v3 index by [@​john-cai](https://github.com/john-cai) in go-git/go-git#407 - plumbing: format/gitignore, Read .git/info/exclude file too. by [@​enisdenjo](https://github.com/enisdenjo) in go-git/go-git#402 - plumbing: format/gitattributes, Avoid index out of range by [@​To1ne](https://github.com/To1ne) in go-git/go-git#598 - plumbing: format/config, Branch name with hash can be cloned. Fixes [#​309](go-git/go-git#309) by [@​dowy](https://github.com/dowy) in go-git/go-git#354 - go.mod: update github.com/xanzy/ssh-agent to v0.3.1 by [@​tklauser](https://github.com/tklauser) in go-git/go-git#403 - go.mod: update dependencies to remove supply chain CVEs by [@​pjbgf](https://github.com/pjbgf) in go-git/go-git#620 - examples: added "tag find if head is tagged" by [@​snebel29](https://github.com/snebel29) in go-git/go-git#374 - examples: remote fix typo by [@​nep-0](https://github.com/nep-0) in go-git/go-git#408 **Full Changelog**: go-git/go-git@v5.4.2...v5.5.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **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:eyJjcmVhdGVkSW5WZXIiOiIzNi43OS4xIiwidXBkYXRlZEluVmVyIjoiMzYuNzkuMSIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==--> Reviewed-on: https://gitea.com/gitea/tea/pulls/578 Co-authored-by: Renovate Bot <renovate-bot@gitea.com> Co-committed-by: Renovate Bot <renovate-bot@gitea.com>
It brings the fix for go-git/go-git#500
When we have multi nested directory and the
.gitignore
file is inside that. Thewroktree.Status()
is not respectingpatterns
inside.gitignore
that can cause the git status to dirty.How to reproduce
Check this repo https://github.com/acumino/git-status. When we run
$ go run ./test.go
which is basically checking the status and returning an error ifstatus
is not clean.It throws an error and ideally it should not.
Explanation
The issue is happening because
append()
is being used for theslice
in recursion at line64
.go-git/plumbing/format/gitignore/dir.go
Lines 49 to 76 in c785af3
The passed value of
fs
is being changed with appends and is being used asdomain
herego-git/plumbing/format/gitignore/pattern.go
Line 42 in c785af3
So when this
fs
is updated next time with append it is causing overwrite to previously writtendomain
values leading to previously addedpattern
's domain to overwritten. So git status basically at the end store wrong pattern to ignore, leading to dirty git status.An explanation of how slices are passed in function and are used internally
golang
https://stackoverflow.com/questions/39993688/are-slices-passed-by-value.Solution
Instead to passing
append(path, fi.Name())
inReadPatterns()
every times a new copy of slice should be passed.The text was updated successfully, but these errors were encountered: