aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into dependabot/go_modules/golang.org/x/net-0.25.0Paulo Gomes2024-05-160-0/+0
|\
| * Merge pull request #1094 from ↵Paulo Gomes2024-05-162-7/+7
| |\ | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/crypto-0.23.0 build: bump golang.org/x/crypto from 0.22.0 to 0.23.0
| | * build: bump golang.org/x/crypto from 0.22.0 to 0.23.0dependabot[bot]2024-05-162-7/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/crypto/compare/v0.22.0...v0.23.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 #1091 from ↵Paulo Gomes2024-05-162-3/+3
| |\ | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/text-0.15.0 build: bump golang.org/x/text from 0.14.0 to 0.15.0
| | * build: bump golang.org/x/text from 0.14.0 to 0.15.0dependabot[bot]2024-05-062-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/text](https://github.com/golang/text) from 0.14.0 to 0.15.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.14.0...v0.15.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* / build: bump golang.org/x/net from 0.24.0 to 0.25.0dependabot[bot]2024-05-072-13/+13
|/ | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.24.0 to 0.25.0. - [Commits](https://github.com/golang/net/compare/v0.24.0...v0.25.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 #1085 from aymanbagabas/head-ref-firstPaulo Gomes2024-04-282-14/+21
|\ | | | | storage: dotgit, head reference usually comes first
| * storage: dotgit, add testAyman Bagabas2024-04-271-7/+13
| |
| * storage: dotgit, head reference usually comes firstAyman Bagabas2024-04-261-7/+8
| | | | | | | | | | | | | | When reading the repository references from DotGit, the HEAD reference should always come first. This mimics the behavior of `git show-ref --head`
* | Merge pull request #1084 from aymanbagabas/sideband-flushPaulo Gomes2024-04-272-3/+28
|\ \ | |/ |/| plumbing: fix sideband demux on flush
| * plumbing: fix sideband demux on flushAyman Bagabas2024-04-262-3/+28
|/ | | | | | | | Canonical Git implementation terminates the sideband stream with a flush. If the demux scanner is not terminated, it can hang the connection. Returns io.EOF when encountering a flush pkt. https://github.com/git/git/blob/master/upload-pack.c#L460
* Merge pull request #1078 from ↵Paulo Gomes2024-04-192-3/+3
|\ | | | | | | | | go-git/dependabot/go_modules/cli/go-git/golang.org/x/net-0.23.0 build: bump golang.org/x/net from 0.22.0 to 0.23.0 in /cli/go-git
| * build: bump golang.org/x/net from 0.22.0 to 0.23.0 in /cli/go-gitdependabot[bot]2024-04-192-3/+3
|/ | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
* plumbing: protocol/packp, client-side filter capability support (#1000)Nikolay Edigaryev2024-04-115-0/+160
| | | * plumbing: protocol/packp, client-side filter capability support
* Merge pull request #1077 from onee-only/refine-testsPaulo Gomes2024-04-115-7/+11
|\ | | | | git: Refine some codes in test and non-test.
| * git: Refine some codes in test and non-test.onee-only2024-04-115-7/+11
|/
* Merge pull request #1066 from codablock/fix-unknown-extensionsPaulo Gomes2024-04-094-41/+201
|\ | | | | Properly support skipping of non-mandatory extensions
| * plumbing: Add link to index-format docsAlexander Block2024-04-091-0/+2
| |
| * plumbing: Add tests for unknown extensions, truncated extensions and invalid ↵Alexander Block2024-04-061-0/+102
| | | | | | | | hashes
| * plumbing: Implement encodeRawExtension that can be used by testsAlexander Block2024-04-061-1/+33
| |
| * plumbing: Properly support skipping of non-mandatory extensionsAlexander Block2024-04-061-8/+30
| | | | | | | | | | | | | | | | | | Before this, go-git would prematurely bail out of extensions processing when an unknown extension was encountered. This had two issues: 1. It did not account for mandatory (lower case header) extensions 2. It did not properly update the calculated hash, leading to an "invalid checksum" error.
| * plumbing: Properly detect EOF when reading index extensionsAlexander Block2024-04-052-35/+37
|/ | | | | | | | | Before this, go-git was relying on the peeked header to not include a valid 4 char string header. While doing this, it did not differentiate between the errournously read final hash and an unknown extension. This made it impossible to properly skip unknown optional extensions while detecting EOF early enough.
* Merge pull request #1071 from ↵Paulo Gomes2024-04-052-10/+10
|\ | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.24.0 build: bump golang.org/x/net from 0.23.0 to 0.24.0
| * build: bump golang.org/x/net from 0.23.0 to 0.24.0dependabot[bot]2024-04-052-10/+10
|/ | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.23.0 to 0.24.0. - [Commits](https://github.com/golang/net/compare/v0.23.0...v0.24.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 #1068 from ↵Paulo Gomes2024-04-042-3/+3
|\ | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.23.0 build: bump golang.org/x/net from 0.22.0 to 0.23.0
| * build: bump golang.org/x/net from 0.22.0 to 0.23.0dependabot[bot]2024-04-042-3/+3
|/ | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.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 #1065 from ↵Paulo Gomes2024-04-042-25/+25
|\ | | | | | | | | go-git/dependabot/go_modules/cli/go-git/github.com/go-git/go-git/v5-5.12.0 build: bump github.com/go-git/go-git/v5 from 5.11.0 to 5.12.0 in /cli/go-git
| * build: bump github.com/go-git/go-git/v5 in /cli/go-gitdependabot[bot]2024-04-012-25/+25
|/ | | | | | | | | | | | | | Bumps [github.com/go-git/go-git/v5](https://github.com/go-git/go-git) from 5.11.0 to 5.12.0. - [Release notes](https://github.com/go-git/go-git/releases) - [Commits](https://github.com/go-git/go-git/compare/v5.11.0...v5.12.0) --- updated-dependencies: - dependency-name: github.com/go-git/go-git/v5 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* Merge pull request #1060 from ↵v5.12.0Paulo Gomes2024-03-192-3/+3
|\ | | | | | | | | go-git/dependabot/go_modules/github.com/gliderlabs/ssh-0.3.7 build: bump github.com/gliderlabs/ssh from 0.3.6 to 0.3.7
| * build: bump github.com/gliderlabs/ssh from 0.3.6 to 0.3.7dependabot[bot]2024-03-192-3/+3
|/ | | | | | | | | | | | | | Bumps [github.com/gliderlabs/ssh](https://github.com/gliderlabs/ssh) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/gliderlabs/ssh/releases) - [Commits](https://github.com/gliderlabs/ssh/compare/v0.3.6...v0.3.7) --- updated-dependencies: - dependency-name: github.com/gliderlabs/ssh dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* Merge pull request #937 from matejrisek/feature/rename-short-fieldsPaulo Gomes2024-03-163-17/+17
|\ | | | | Replace short field names with more descriptive ones.
| * plumbing: Replace short field names with more descriptive ones.Matej Risek2023-11-193-17/+17
| | | | | | | | | | The decision to change the name of these fields came from reading the code further down in the scope and not being clear what `c.c` means.
* | Merge pull request #1052 from ↵Paulo Gomes2024-03-132-3/+3
|\ \ | | | | | | | | | | | | go-git/dependabot/go_modules/github.com/skeema/knownhosts-1.2.2 build: bump github.com/skeema/knownhosts from 1.2.1 to 1.2.2
| * | build: bump github.com/skeema/knownhosts from 1.2.1 to 1.2.2dependabot[bot]2024-03-132-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/skeema/knownhosts](https://github.com/skeema/knownhosts) from 1.2.1 to 1.2.2. - [Commits](https://github.com/skeema/knownhosts/compare/v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: github.com/skeema/knownhosts dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | 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
| | | |