aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #719 from cbbm142/masterPaulo Gomes2023-05-032-1/+48
|\ | | | | git: worktree, add check to see if file already checked in. Fixes #718
| * Worktree: Status, add check to see if file already checked in [Fixes 718]John Pastore2023-05-012-1/+48
| | | | | | | | Checks if an ignored file was previously checked in. If it was, then the file is not ignored matching native git behavior.
* | Merge pull request #755 from AriehSchneier/fix-clone-branchPaulo Gomes2023-05-032-3/+23
|\ \ | | | | | | git: fix cloning with branch name
| * | git: fix cloning with branch nameArieh Schneier2023-05-032-3/+23
| | | | | | | | | | | | Signed-off-by: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
* | | Merge pull request #750 from pjbgf/peelPaulo Gomes2023-05-034-8/+92
|\ \ \ | |/ / |/| | git: Add support to ls-remote with peeled references. Fixes #749
| * | git: Add support to ls-remote with peeled references. Fixes #749Paulo Gomes2023-05-034-8/+92
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new PeelingOption field was introduced into ListOptions. The new options include the default (and backwards compatible) IgnorePeeled. Plus another two variations which either only returns peeled references (OnlyPeeled), or append peeled references to the list (AppendPeeled). The ls-remote example was updated to align with upstream, in which peeled references are appended to the results by default. A new ErrEmptyUrls error is now returned when List or ListContext do not receive a URL to work with, to improve overall execution flow. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | Merge pull request #728 from aymanbagabas/grep-barePaulo Gomes2023-04-263-9/+101
|\ \ | | | | | | fix: git grep bare repositories
| * | fix: git grep bare repositoriesAyman Bagabas2023-04-263-9/+101
| | | | | | | | | | | | | | | | | | Perform grep on `*Repository` instead of `*Worktree`. Fixes: https://github.com/go-git/go-git/issues/68
* | | Merge pull request #748 from pjbgf/bump-ciPaulo Gomes2023-04-262-24/+33
|\ \ \ | | | | | | | | build: Bump dependencies
| * | | build: Bump dependencies. Fixes #667Paulo Gomes2023-04-232-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - github.com/ProtonMail/go-crypto to version 0.0.0-20230417170513-8ee5748c52b5. - github.com/imdario/mergo to version 0.3.15. - golang.org/x/crypto to version 0.8.0. - golang.org/x/net to version 0.9.0. - golang.org/x/sys to version 0.7.0. - golang.org/x/text to version 0.9.0. - github.com/go-git/gcfg to version v1.5.1-0.20230307220236-3a3c6141e376 Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | | Merge pull request #743 from fcharlie/improve-packed-refsPaulo Gomes2023-04-262-43/+39
|\ \ \ \ | |/ / / |/| | | storage: filesystem/dotgit, Improve load packed-refs
| * | | storage: filesystem/dotgit, Improve load packed-refsForce Charlie2023-04-252-43/+39
| |/ /
* | | Merge pull request #735 from aymanbagabas/clone-mirrorPaulo Gomes2023-04-174-4/+55
|\ \ \ | | | | | | | | git: add mirror clone option
| * | | feat(clone): add mirror clone optionAyman Bagabas2023-04-174-4/+55
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clone remote as a mirror. This fetches all remote refs, implies bare repository, and sets the appropriate configs. Fixes: https://github.com/go-git/go-git/issues/293 Update options.go Co-authored-by: Paulo Gomes <paulo.gomes.uk@gmail.com> Signed-off-by: Ayman Bagabas <ayman.bagabas@gmail.com>
* | | Merge pull request #715 from jotadrilo/fix/csp-likePaulo Gomes2023-04-173-35/+98
|\ \ \ | |/ / |/| | internal: Fix regression in scp-like match
| * | internal: Fix regression in csp-like matchJoseda Rios2023-04-153-35/+98
| |/ | | | | | | Signed-off-by: Joseda Rios <josriolop@gmail.com>
* | Merge pull request #739 from pjbgf/fix-ciPaulo Gomes2023-04-123-3/+4
|\ \ | | | | | | ci: Fix upstream git build for master branch
| * | ci: Fix upstream git build for master branchPaulo Gomes2023-04-113-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes upstream broke the compatibility test, which now requires libcurl installed in order to successfully build. Additionally, the .git-dist dir was added to the .gitignore file. Fixes: https://github.com/go-git/go-git/actions/runs/4670641376/jobs/8270625669 Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | Merge pull request #707 from pjbgf/experimental-sha256Paulo Gomes2023-04-1123-60/+298
|\ \ \ | |/ / |/| | *: Add support for initializing SHA256 repositories
| * | examples: Add example for SHA256 repositoriesPaulo Gomes2023-03-083-0/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new example on initializing a new repository with object format SHA256. A new Makefile target was created to run the example to ensure that new changes won't break SHA256 support going forwards. Relates to the SHA256 implementation, defined in #706. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | *: Support variable length plumbing.HashPaulo Gomes2023-03-0813-38/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The variable length for plumbing.Hash is defined at build time, blocked by tag sha256. This approach was a trade-off between keeping backwards compatibility while making progress towards supporting SHA256 with a small amount of changes. Relates to the SHA256 implementation, defined in #706. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | config: Add Repository Format ExtensionPaulo Gomes2023-03-084-22/+149
| | | | | | | | | | | | | | | | | | Relates to the SHA256 implementation, defined in #706. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | plumbing/hash: Add SHA256 as a supported algorithmPaulo Gomes2023-03-073-0/+33
| | | | | | | | | | | | | | | | | | Relates to #706. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | Merge pull request #485 from ZauberNerd/fix-non-external-delta-refPaulo Gomes2023-04-114-3/+25
|\ \ \ | |_|/ |/| | plumbing: resolve non-external delta references
| * | plumbing: resolve non-external delta referencesZauberNerd2023-03-234-3/+25
|/ / | | | | | | | | | | | | | | | | | | | | In a self-contained pack file delta references might point to base objects stored later in the file. In this case we need to replace placeholders for external refs with the actual base object and update the children references. Fixes: #484 Co-authored-by: Markus Wolf <mail@markus-wolf.de>
* | Merge pull request #659 from MichaelMure/dotgit-racev5.6.1Paulo Gomes2023-03-072-0/+73
|\ \ | |/ |/| dotgit: fix a filesystem race in Refs/walkReferencesTree
| * dotgit: fix deleted references test in windowsJavi Fontan2023-03-071-2/+3
| | | | | | | | Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * dotgit: test skip deleted referencesJavi Fontan2023-03-071-0/+67
| | | | | | | | | | | | | | Checks that reading references it correctly skips deleted directories and files. Signed-off-by: Javi Fontan <jfontan@gmail.com>
| * dotgit: fix a filesystem race in Refs/walkReferencesTreeMichael Muré2023-01-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | In walkReferencesTree(), the filesystem is browsed recursively. After a folder is listed, each child element (directory, file) are inspected. What can happen is that by the time we get to operate on the child element, it might have been deleted from the filesystem and we would get a PathError. In the case of directories there was already a case to avoid bubbling up the error (we consider that there is no ref there, which is correct), but that was missing for files. This commit just apply the same logic.
* | Merge pull request #655 from aymanbagabas/hostkeycallbackPaulo Gomes2023-03-064-43/+101
|\ \ | | | | | | fix(ssh): unable to pass a custom HostKeyCallback func
| * | fix(ssh): unable to pass a custom HostKeyCallback funcAyman Bagabas2023-03-054-43/+101
| |/ | | | | | | | | | | | | | | Don't overwrite HostKeyCallback if one is provided. Fixes: c35b8082c863 ("plumbing: transport/ssh, auto-populate ClientConfig.HostKeyAlgorithms. Fixes #411") Fixes: https://github.com/go-git/go-git/issues/654 Signed-off-by: Ayman Bagabas <ayman.bagabas@gmail.com>
* | Merge pull request #701 from pjbgf/buildPaulo Gomes2023-03-064-6/+6
|\ \ | | | | | | ci: Bump GitHub actions, enable go test race detection and stop using developer's GPG keys during test execution
| * | ci: Enable race detection for go testsPaulo Gomes2023-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After the fix of data races in go-billy (go-git/go-billy/pull/28) race detection can be enabled in go-git to ensure no new issues go undetected. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | ci: Bump GitHub actionsPaulo Gomes2023-03-052-4/+4
| | | | | | | | | | | | | | | | | | | | | Removes the error messages: Node.js 12 actions are deprecated. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | tests: Avoid use of user's GPG keys during testsPaulo Gomes2023-03-051-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The TestPullAdd test uses git CLI to perform a commit. Contributors with signing enabled globally would have their GPG configuration being used to sign that test commit. This behaviour was transparent for contributors that do not use secure keys which requires physical confirmation. The new behaviour disables GPG signing for that test, which was not required as part of the test. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | Merge pull request #696 from pjbgf/fix-panic-rrPaulo Gomes2023-03-022-35/+50
|\ \ | | | | | | *: Fix panic for empty revisions. Fixes #674
| * | *: Fix panic for empty revisionsPaulo Gomes2023-03-022-35/+50
|/ / | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | Merge pull request #697 from pjbgf/bump-depsPaulo Gomes2023-03-024-17/+21
|\ \ | | | | | | Bump dependencies
| * | build: Reduce git token permissionsPaulo Gomes2023-03-022-0/+6
| | | | | | | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | Bump dependenciesPaulo Gomes2023-03-022-17/+15
|/ / | | | | | | | | | | | | | | | | - github.com/ProtonMail/go-crypto to version 0.0.0-20230217124315-7d5c6f04bbb8. - github.com/acomagu/bufpipe to version 1.0.4. - github.com/go-git/go-billy/v5 to version 5.4.1. - golang.org/x/crypto to version 0.6.0. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | Merge pull request #682 from ThinkChaos/fix/transport-empty-unknown-errPaulo Gomes2023-03-022-1/+15
|\ \ | | | | | | fix: don't use the `firstErrLine` when it is empty
| * | fix: don't use the `firstErrLine` when it is emptyThinkChaos2023-02-212-1/+15
| | | | | | | | | | | | | | | Returning `nil` causes `handleAdvRefDecodeError` to fall back to `io.ErrUnexpectedEOF`.
* | | Merge pull request #684 from go-git/dependabot/go_modules/golang.org/x/net-0.7.0Paulo Gomes2023-03-022-7/+11
|\ \ \ | | | | | | | | build(deps): bump golang.org/x/net from 0.2.0 to 0.7.0
| * | | build(deps): bump golang.org/x/net from 0.2.0 to 0.7.0dependabot[bot]2023-03-022-7/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.2.0 to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/compare/v0.2.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #692 from pat-nel87/masterMáximo Cuadros2023-03-011-1/+0
|\ \ \ | | | | | | | | _examples: README.md , Remove broken Config link.
| * | | _examples: README.md , Remove broken Config link. pat-nel872023-02-271-1/+0
| |/ / | | | | | | | | | This link is broken and doesn't appear to map to anything current. I propose We remove this link.
* | | Merge pull request #690 from hiddeco/recognize-tag-signaturesv5.6.0Máximo Cuadros2023-02-284-32/+307
|\ \ \ | | | | | | | | plumbing: support SSH/X509 signed tags
| * | | plumbing: support SSH/X509 signed tagsHidde Beydals2023-02-274-32/+307
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit enables support for extracting the SSH and X509 signatures from (annotated) Git tags, as an initial step to support the verification of more signatures than just PGP in go-git. The ported logic from Git further ensures that we look for a signature at the tail of an annotation, instead of the first signature we find in the annotation, as this could theoretically result in a faulty signature getting detected if part of a an annotation itself (e.g. by being placed in the middle as part of an inherited message). For commits, no further change is required as the current extraction of any signature (format) from `gpgsig` in the commit header is sufficient for manual verification. In a future iteration, we could add `signature/ssh` and `signature/x509` packages to further enable people to deal with verifying other signatures than PGP. As well as adding additional methods to `Commit` and `Tag` to provide glue between the packages and the most prominent user-facing APIs. Signed-off-by: Hidde Beydals <hidde@hhh.computer>
* | | Merge pull request #688 from pjbgf/bump-sha1cdMáximo Cuadros2023-02-283-7/+14
|\ \ \ | |/ / |/| | Remove need to build with CGO
| * | Remove need to build with CGOPaulo Gomes2023-02-253-7/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | Follow-up from #618, at the time the Pure Go sha1cd implementation was not performant enough to be the default. This has now changed and the cgo and generic implementations yields similar results. Users are able to override the default implementation, however this seems to be a better default as it does not require the use of CGO during build time. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
generated by cgit (git 2.34.1) at 2024-11-11 16:55:19 +0000