aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'go-git:master' into parse-x509-signed-messageYoav Amit2024-08-215-9/+382
|\
| * Merge pull request #493 from openmetagame/git-restore-for-pr-2022Paulo Gomes2024-08-215-9/+382
| |\ | | | | | | Add RestoreStaged to Worktree that mimics the behaviour of git restore --staged <file>...
| | * git: worktree, add RestoreStaged which works like the "git restore --staged ↵Ben Talbot2024-04-195-9/+382
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <file>..." command Small formatting and style fixes before rebasing against master Setup args for restore in TestExamples Fix typo in error message and remove dependency on fmt in worktree_test
* | | plumbing: signature, support the same x509 signature formats as gitYoav Amit2024-08-202-1/+15
|/ / | | | | | | | | Commits and tags signed with x509 certificates may be encoded with the `SIGNED MESSAGE` PEM label. This behavior is consistent in [git](https://github.com/git/git/blob/master/gpg-interface.c\#L63) and [gpgsm](https://github.com/gpg/gnupg/blob/master/sm/sign.c\#L650) which is commonly used to produce these types of signatures.
* | Merge pull request #1164 from ↵Paulo Gomes2024-08-092-3/+3
|\ \ | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/sys-0.24.0 build: bump golang.org/x/sys from 0.23.0 to 0.24.0
| * | build: bump golang.org/x/sys from 0.23.0 to 0.24.0dependabot[bot]2024-08-092-3/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.23.0 to 0.24.0. - [Commits](https://github.com/golang/sys/compare/v0.23.0...v0.24.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | adjust path extracted from file: url on Windows (#416)tomqwpl2024-08-092-2/+57
| | | | | | | | | | * adjust path extracted from file: url on Windows Fixes #415
* | Merge pull request #1128 from pjbgf/small-fixesPaulo Gomes2024-08-096-8/+8
|\ \ | | | | | | Fix some lint warning and increase stalebot to 180 days
| * | build: Increase min stale time to 180 daysPaulo Gomes2024-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | To decrease the noise generated by the stalebot increase the minimum amount of days to 180 days. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | *: Small fixes to remove linter warningsPaulo Gomes2024-06-295-7/+7
| | | | | | | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | Merge pull request #1163 from ↵Paulo Gomes2024-08-072-13/+13
|\ \ \ | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.28.0 build: bump golang.org/x/net from 0.27.0 to 0.28.0
| * | | build: bump golang.org/x/net from 0.27.0 to 0.28.0dependabot[bot]2024-08-072-13/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.27.0 to 0.28.0. - [Commits](https://github.com/golang/net/compare/v0.27.0...v0.28.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>
* | | plumbing: filemode, Remove check for setting size of .git/index file (#1159)Nicholas openSUSE Software Engineer2024-08-062-3/+94
| | | | | | | | | | | | | | | * plumbing: filemode, Remove check for setting size of .git/index file on staging. Fixes #1003 Co-authored-by: Paulo Gomes <paulo.gomes.uk@gmail.com>
* | | Merge pull request #1160 from ↵Paulo Gomes2024-08-052-3/+3
|\ \ \ | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/sys-0.23.0 build: bump golang.org/x/sys from 0.22.0 to 0.23.0
| * | | build: bump golang.org/x/sys from 0.22.0 to 0.23.0dependabot[bot]2024-08-052-3/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.22.0 to 0.23.0. - [Commits](https://github.com/golang/sys/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #1023 from rodrigocam/masterPaulo Gomes2024-08-033-3/+115
|\ \ \ | | | | | | | | git: worktree, Fix file reported as `Untracked` while it is committed
| * | | git: worktree, Add StatusWithOptionsPaulo Gomes2024-08-033-38/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for #119 improves the Worktree.Status() behaviour by preloading all existing files and setting their status to unmodified. Which makes it more reliable when doing per file status verification, however breaks backwards compatibility in two ways: - Increased execution time and space: the preloading can be slow in very large repositories and will increase memory usage when representing the state. - Behaviour: the previous behaviour returned a map with a small subset of entries. The new behaviour will include a new entry for every file within the repository. This commit introduces reverts the change in the default behaviour, and introduces StatusWithOptions so that users can opt-in the new option. Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | | git: worktree, Build status based on the current index instead of building ↵Rodrigo Oliveira2024-02-052-1/+57
| | | | | | | | | | | | | | | | it empty. Fixes #119
* | | | Merge pull request #1152 from edigaryev/remove-duplicate-checksPaulo Gomes2024-07-311-11/+9
|\ \ \ \ | | | | | | | | | | plumbing: format/packfile, remove duplicate checks in findMatch()
| * | | | plumbing: format/packfile, early returnNikolay Edigaryev2024-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | Co-authored-by: onee-only <kimww0306@gmail.com>
| * | | | plumbing: format/packfile, remove duplicate checks in findMatch()Nikolay Edigaryev2024-07-201-11/+9
| | | | |
* | | | | Merge pull request #1032 from AriehSchneier/fix-failed-fetchingPaulo Gomes2024-07-292-13/+58
|\ \ \ \ \ | | | | | | | | | | | | git: Fix fetching missing commits
| * | | | | git: Fix fetching missing commitsArieh Schneier2024-07-292-13/+58
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Arieh Schneier <15041913+AriehSchneier@users.noreply.github.com>
* | | | | Merge pull request #1138 from SatelliteMind/bugfix/object-cachePaulo Gomes2024-07-262-2/+63
|\ \ \ \ \ | | | | | | | | | | | | storage: filesystem, Fix object cache not working due to uninitialised objects being put into cache
| * | | | | storage: filesystem, Fix object cache not working due to uninitialised ↵SatelliteMind2024-07-122-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | objects being put into cache; The hash (which is the cache key) returned by the object at the previous put-into-cache point is always zero, so subsequent loads of the same object were never resolved from the cache.
* | | | | | Merge pull request #1030 from crazybolillo/i912-crazybolilloPaulo Gomes2024-07-261-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | build: run example tests during CI workflow
| * | | | | | build: Fix syntax to test examples on WindowsPaulo Gomes2024-07-261-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
| * | | | | | build: run example tests during CI workflowCrazyBolillo2024-03-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests for examples exist, however they were not being run as part of the CI. This commit fixes it by adding a new step in the test workflow which runs said tests. Related to #912.
* | | | | | | Merge pull request #1157 from Javier-varez/ja/knownHostsDbPaulo Gomes2024-07-263-12/+124
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | plumbing: transport/ssh, Add support for SSH @cert-authority.
| * | | | | | plumbing: transport/ssh, Add support for SSH @cert-authority.Javier Alvarez Garcia2024-07-243-12/+124
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skeema/knownhosts v1.3.0 introduced a HostKeyDB type that extends the HostKeyCallback functionality to support @cert-authority algorithms. `known_hosts` files may contain lines with @cert-authority markers to indicate that a line corresponds to a certificate instead of a key. If a git remote uses cert authorities as the preferred host identification mechanism, the functionality added in skeema/knownhosts v1.3.0 is needed so that go-git can interact with this remote. See https://github.com/skeema/knownhosts/pull/9 for details.
* | | | | | Merge pull request #1147 from ↵Paulo Gomes2024-07-182-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/github.com/skeema/knownhosts-1.3.0 build: bump github.com/skeema/knownhosts from 1.2.2 to 1.3.0
| * | | | | | build: bump github.com/skeema/knownhosts from 1.2.2 to 1.3.0dependabot[bot]2024-07-172-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/skeema/knownhosts](https://github.com/skeema/knownhosts) from 1.2.2 to 1.3.0. - [Commits](https://github.com/skeema/knownhosts/compare/v1.2.2...v1.3.0) --- updated-dependencies: - dependency-name: github.com/skeema/knownhosts dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | | Merge pull request #1114 from BauWatch/fix-load-ignored-gitignoresPaulo Gomes2024-07-132-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | plumbing: gitignore, Fix loading of ignored .gitignore files.
| * | | | | | plumbing: gitignore, Fix loading of ignored .gitignore files.Wouter Horlings2024-06-172-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop loading .gitignore files from ignored directories, as this can cause files to be included that should not be. See https://git-scm.com/docs/gitignore#_pattern_format
* | | | | | | Merge pull request #1141 from pjbgf/absPaulo Gomes2024-07-132-7/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | plumbing: transport/file, Change paths to absolute
| * | | | | | | plumbing: transport/file, Change paths to absolutePaulo Gomes2024-07-132-7/+35
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | | | | | Merge pull request #1142 from pjbgf/emptyPaulo Gomes2024-07-132-0/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | utils: merkletrie, Align error message with upstream
| * | | | | | utils: merkletrie, Align error message with upstreamPaulo Gomes2024-07-132-0/+20
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Paulo Gomes <pjbgf@linux.com>
* | | | | | Merge pull request #1134 from ↵Paulo Gomes2024-07-052-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.27.0 build: bump golang.org/x/net from 0.26.0 to 0.27.0
| * | | | | | build: bump golang.org/x/net from 0.26.0 to 0.27.0dependabot[bot]2024-07-052-10/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.26.0 to 0.27.0. - [Commits](https://github.com/golang/net/compare/v0.26.0...v0.27.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 #1116 from Javier-varez/ja/FixReferenceUpdatedConcurrentlyPaulo Gomes2024-06-292-0/+79
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix reference updated concurrently error for the filesystem storer
| * | | | | storage: Fix reference updated concurrently error for the filesystem storerJavier Alvarez Garcia2024-06-292-0/+79
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a reference exists in the packed refs file but not in the actual refs folder, we need to fall back to reading the pack refs file when storing the reference. This happens because by the time we are storing the reference, we open the file with write permissions and read from it. At that point, if the file is empty, we still need to read the valid reference. Otherwise, it will read 0, and assume that the references do not match (because the old value was read from the packed file).
* | | | | Merge pull request #1129 from go-git/revert-995-git-cleanPaulo Gomes2024-06-284-54/+11
|\ \ \ \ \ | | | | | | | | | | | | Revert "Add option approximating `git clean -x` flag."
| * | | | | Revert "Add option approximating `git clean -x` flag."Paulo Gomes2024-06-284-54/+11
|/ / / / /
* | | | | Merge pull request #995 from msuozzo/git-cleanPaulo Gomes2024-06-284-11/+54
|\ \ \ \ \ | | | | | | | | | | | | Add option approximating `git clean -x` flag.
| * | | | | git: add option approximating git clean -x.Matthew Suozzo2024-01-124-11/+54
| | | | | |
* | | | | | Merge pull request #1104 from ↵Paulo Gomes2024-06-272-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | go-git/dependabot/go_modules/golang.org/x/net-0.26.0 build: bump golang.org/x/net from 0.25.0 to 0.26.0
| * | | | | | build: bump golang.org/x/net from 0.25.0 to 0.26.0dependabot[bot]2024-06-272-7/+7
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.26.0. - [Commits](https://github.com/golang/net/compare/v0.25.0...v0.26.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 #1124 from hbelmiro/upgrade-goproxyPaulo Gomes2024-06-272-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | build: bump github.com/elazarl/goproxy from v0.0.0-20230808193330-2592e75ae04a to v0.0.0-20240618083138-03be62527ccb
| * | | | | | build: bump github.com/elazarl/goproxy from ↵hbelmiro2024-06-272-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | v0.0.0-20230808193330-2592e75ae04a to v0.0.0-20240618083138-03be62527ccb