aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1048 from pjbgf/fix-reset-validationPaulo Gomes2024-03-122-0/+11
|\ | | | | git: Add commit validation for Reset
| * git: Add commit validation for Reset. Fixes #878Paulo Gomes2024-03-112-0/+11
| | | | | | | | Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
* | Merge pull request #1047 from avoidalone/masterPaulo Gomes2024-03-123-4/+4
|\ \ | | | | | | chore: fix some comments
| * | *: fix some commentsavoidalone2024-03-123-4/+4
| | | | | | | | | | | | Signed-off-by: avoidalone <wuguangdong@outlook.com>
* | | Merge pull request #1044 from pjbgf/ff-mergePaulo Gomes2024-03-125-25/+188
|\ \ \ | | | | | | | | git: Implement Merge function with initial `FastForwardMerge` support
| * | | git: Implement Merge function with initial FastForwardMerge supportPaulo Gomes2024-03-095-67/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces the Merge function for merging branches in the codebase. Currently, the function only supports FastForwardMerge strategy, meaning it can efficiently update the target branch pointer if the source branch history is a linear descendant. Support for additional merge strategies (e.g., three-way merge) will be added in future commits. Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
| * | | git: Add Merge with ff-onlyJohn Cai2024-03-093-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | Add a Merge function that behaves like git merge. This is a first iteration that only supports --ff-only, which is the simplest type of merge.
* | | | Merge pull request #971 from nodivbyzero/fix-177-diff-print-file-statsPaulo Gomes2024-03-113-55/+152
|\ \ \ \ | |_|/ / |/| | | plumbing: no panic in printStats function. Fixes #177
| * | | plumbing: no panic in printStat function. Fixes #177nodivbyzero2024-03-113-55/+152
| | | |
* | | | Merge pull request #1046 from onee-only/optimize-commit-worker-pathPaulo Gomes2024-03-102-6/+14
|\ \ \ \ | |_|_|/ |/| | | plumbing: object, Optimize logging with file.
| * | | plumbing: object, Apply memoization in (*treeNoder).Children.onee-only2024-03-101-1/+3
| | | |
| * | | plumbing: object, Optimize getNextFileCommit to reuse parent tree.onee-only2024-03-101-5/+11
| | |/ | |/|
* | | Merge pull request #1045 from onee-only/fix-amend-with-changesPaulo Gomes2024-03-102-17/+39
|\ \ \ | |/ / |/| | git: worktree_commit, Fix amend commit to apply changes. Fixes #1024
| * | git: worktree_commit, Fix amend commit to apply changes. Fixes #1024onee-only2024-03-102-17/+39
|/ /
* | Merge pull request #967 from niukuo/filenamePaulo Gomes2024-03-092-0/+58
|\ \ | | | | | | plumbing: object, check legitimacy in (*Tree).Encode
| * | plumbing: object, check entry order in (*Tree).Encode, export TreeEntrySorteryiteng.nyt2024-03-082-0/+55
| | |
| * | plumbing: object, check filename in (*Tree).Encodeyiteng.nyt2024-03-081-0/+3
|/ /
* | Merge pull request #1042 from tim775/fix/worktree_valid_path_panicPaulo Gomes2024-03-062-0/+6
|\ \ | | | | | | git: worktree, Don't panic on empty or root path when checking if it is valid
| * | git: worktree, Don't panic on empty or root path when checking if it is validtim7752024-03-062-0/+6
|/ / | | | | | | I didn't dig into the specific case that was triggering this, but we did have a panic in our production system.
* | Merge pull request #1036 from onee-only/masterPaulo Gomes2024-03-062-1/+28
|\ \ | | | | | | plumbing: object, Make first commit visible on logs filtered with filename. Fixes #191
| * | plumbing: object, Make first commit visible on logs filtered with filename. ↵onee-only2024-03-052-1/+28
| | | | | | | | | | | | Fixes #191
* | | Merge pull request #1039 from ↵Paulo Gomes2024-03-052-10/+10
|\ \ \ | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.22.0 build: bump golang.org/x/net from 0.21.0 to 0.22.0
| * | | build: bump golang.org/x/net from 0.21.0 to 0.22.0dependabot[bot]2024-03-052-10/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.21.0 to 0.22.0. - [Commits](https://github.com/golang/net/compare/v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #1037 from ↵Paulo Gomes2024-03-012-3/+3
|\ \ \ | |/ / |/| | | | | | | | go-git/dependabot/go_modules/github.com/stretchr/testify-1.9.0 build: bump github.com/stretchr/testify from 1.8.4 to 1.9.0
| * | build: bump github.com/stretchr/testify from 1.8.4 to 1.9.0dependabot[bot]2024-03-012-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.4 to 1.9.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.8.4...v1.9.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #1035 from ↵Paulo Gomes2024-02-282-3/+3
|\ \ | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/crypto-0.20.0 build: bump golang.org/x/crypto from 0.19.0 to 0.20.0
| * | build: bump golang.org/x/crypto from 0.19.0 to 0.20.0dependabot[bot]2024-02-272-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.19.0 to 0.20.0. - [Commits](https://github.com/golang/crypto/compare/v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #366 from juliens/prunePaulo Gomes2024-02-223-2/+148
|\ \ | | | | | | remote: fetch, adds the prune option.
| * | *: fetch, adds the prune option. Fixes #316Julien Salleyron2024-02-223-2/+148
|/ / | | | | | | Co-authored-by: Ludovic Fernandez <ldez@users.noreply.github.com>
* | Merge pull request #1029 from wlynch/signer-fixPaulo Gomes2024-02-214-35/+94
|\ \ | | | | | | Signer: fix usage of crypto.Signer interface
| * | git: signer, fix usage of crypto.Signer interfaceBilly Lynch2024-02-134-35/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crypto.Signer was incorrectly used before. Signer documentation says that Signer.Sign should be used on digests, whereas we were using this on message bodies. To fix this, create our own Signer interface (+ signableObject borrowed from #705) that describes more accurately what we want. As before, the expectation is that signer implementations only need to worry about acting on encoded message bodies rather than needing to encode objects themselves. This is technically a breaking change from the previous Signer implementation, but since this is new and hasn't made it into cut release yet, this seems like an acceptible change. Also adds example test showing how signers can be made (uses base64 for consistent outputs).
* | | Merge pull request #446 from dlambda/co-brPaulo Gomes2024-02-213-35/+124
|\ \ \ | |/ / |/| | checkout-branch example
| * | _examples: add example testing to `make test` as suggested by pjbgfDavid Lamb2024-02-211-0/+1
| | |
| * | _examples: fix other example args + more ignores so example testingDavid Lamb2024-02-211-0/+6
| | | | | | | | | | | | completes
| * | _examples: PR feedback - use plumbing instead of sprintfDavid Lamb2024-02-211-1/+1
| | | | | | | | | | | | Co-authored-by: Johannes Huning <johannes.huning@gmail.com>
| * | _examples: original PR - add checkout-branchDavid Lamb2024-02-212-35/+117
|/ /
* | Merge pull request #1027 from ↵Paulo Gomes2024-02-082-10/+10
|\ \ | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.21.0 build: bump golang.org/x/net from 0.20.0 to 0.21.0
| * | build: bump golang.org/x/net from 0.20.0 to 0.21.0dependabot[bot]2024-02-082-10/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.20.0 to 0.21.0. - [Commits](https://github.com/golang/net/compare/v0.20.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #1018 from prskr/1017-readattributes-does-not-close-filePaulo Gomes2024-02-052-6/+11
|\ \ | | | | | | plumbing: format/gitattributes, close file in ReadAttributesFile
| * | plumbing: format/gitattributes, close file in ReadAttributesFilePeter Kurfer2024-02-052-6/+11
| | | | | | | | | | | | Fixes #1017
* | | Merge pull request #1022 from grinish21/doc/404-linkPaulo Gomes2024-02-051-1/+2
|\ \ \ | |/ / |/| | _example: fix 404 link and added ssh-agent clone link
| * | _example: fix 404 link and added ssh-agent clone linkGRINISH NEPAL2024-02-041-1/+2
|/ /
* | Merge pull request #1007 from pjbgf/go-diffPaulo Gomes2024-01-262-4/+4
|\ \ | | | | | | build: Bump github.com/sergi/go-diff
| * | build: Bump github.com/sergi/go-diffPaulo Gomes2024-01-222-4/+4
| | | | | | | | | | | | Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
* | | Merge pull request #994 from moranCohen26/supportFastAddPathPaulo Gomes2024-01-234-10/+294
|\ \ \ | | | | | | | | Worktree.AddWithOptions: add skipStatus option when providing a specific path
| * | | git: Worktree.AddWithOptions, add skipStatus option. #993Moran Cohen2024-01-174-11/+294
| |/ /
* | | Merge pull request #996 from wlynch/signer-configPaulo Gomes2024-01-233-11/+48
|\ \ \ | | | | | | | | Add crypto.Signer option to CommitOptions.
| * | | git: worktree_commit, Add crypto.Signer option to CommitOptions.Billy Lynch2024-01-183-11/+48
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new crypto.Signer option to CommitOptions as an alternative to SignKey to allow alternative commit signers to be used. This change byitself does not add other signing methods (e.g. ssh, x509, gitsign), but gives callers the ability to add their own. This roughly follows git's sign_buffer approach where go-git handles the commit message body encoding, and hands off the encoded []byte to the signing implementation for the signature to be returned. Signed-off-by: Billy Lynch <billy@chainguard.dev>
* | | Merge pull request #1004 from ↵Paulo Gomes2024-01-172-3/+3
|\ \ \ | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/github.com/ProtonMail/go-crypto-1.0.0 build: bump github.com/ProtonMail/go-crypto from 0.0.0-20230828082145-3c4c8a2d2371 to 1.0.0
| * | | build: bump github.com/ProtonMail/go-cryptodependabot[bot]2024-01-172-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/ProtonMail/go-crypto](https://github.com/ProtonMail/go-crypto) from 0.0.0-20230828082145-3c4c8a2d2371 to 1.0.0. - [Release notes](https://github.com/ProtonMail/go-crypto/releases) - [Commits](https://github.com/ProtonMail/go-crypto/commits/v1.0.0) --- updated-dependencies: - dependency-name: github.com/ProtonMail/go-crypto dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
generated by cgit (git 2.34.1) at 2024-11-11 11:58:04 +0000