diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-06 16:40:54 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-10-11 08:29:16 +0300 |
| commit | 67c78c45d846bd794ac123310c4caf63b399d5a5 (patch) | |
| tree | ca4ea7eb1c64b1bb4e788f1462871454d150b660 | |
| parent | 85c6330bd945fc8aa4562e60b5e175fd7f0f6cb2 (diff) | |
Makefile: Upgrade libgit2 to v1.5.0
Upstream has released libgit2 v1.5.0 on July 14th already, but so far we
had been blocked from upgrading as Git2go didn't yet support it. This
has now changed with the release of Git2go v34, so let's upgrade both so
that we run with the latest version.
Notable upstream changes include:
- Initial work on support for SHA256 as object hash.
- Fixes for CVE 2022-24765 and CVE 2022-29187, which could lead to
arbitrary code execution in repositories not owned by the current
user. libgit2 was not directly impacted, but the fixes now align
behaviour with Git and thus refuses to open repositories owned by
a different user.
- Several fixes for MIDX files, which might be beneficial with our
plans to start using them.
- The rename-detection limit for merges was bumped from 200 to 1000
files to match Git's behaviour.
There are many other changes, but due to our limited use of libgit2 most
of them aren't relevant to us.
29 files changed, 31 insertions, 31 deletions
@@ -181,8 +181,8 @@ endif # Git2Go and libgit2 may need to be updated in sync. Please refer to # https://github.com/libgit2/git2go/#which-go-version-to-use for a # compatibility matrix. -GIT2GO_VERSION ?= v33 -LIBGIT2_VERSION ?= v1.3.2 +GIT2GO_VERSION ?= v34 +LIBGIT2_VERSION ?= v1.5.0 LIBGIT2_REPO_URL ?= https://gitlab.com/libgit2/libgit2 LIBGIT2_SOURCE_DIR ?= ${DEPENDENCY_DIR}/libgit2/source LIBGIT2_BUILD_DIR ?= ${DEPENDENCY_DIR}/libgit2/build @@ -18695,7 +18695,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE - github.com/libgit2/git2go/v33 +LICENSE - github.com/libgit2/git2go/v34 The MIT License Copyright (c) 2013 The git2go contributors diff --git a/cmd/gitaly-git2go/apply.go b/cmd/gitaly-git2go/apply.go index e5cc1339a..4e9ec16d6 100644 --- a/cmd/gitaly-git2go/apply.go +++ b/cmd/gitaly-git2go/apply.go @@ -14,7 +14,7 @@ import ( "os/exec" "path/filepath" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/cherry_pick.go b/cmd/gitaly-git2go/cherry_pick.go index 1a185a7e2..f0d5cdb16 100644 --- a/cmd/gitaly-git2go/cherry_pick.go +++ b/cmd/gitaly-git2go/cherry_pick.go @@ -9,7 +9,7 @@ import ( "flag" "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/cherry_pick_test.go b/cmd/gitaly-git2go/cherry_pick_test.go index 4522f3d94..25d1c843f 100644 --- a/cmd/gitaly-git2go/cherry_pick_test.go +++ b/cmd/gitaly-git2go/cherry_pick_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" diff --git a/cmd/gitaly-git2go/commit/change_file_mode.go b/cmd/gitaly-git2go/commit/change_file_mode.go index e07db9ba4..94f1490c7 100644 --- a/cmd/gitaly-git2go/commit/change_file_mode.go +++ b/cmd/gitaly-git2go/commit/change_file_mode.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/commit.go b/cmd/gitaly-git2go/commit/commit.go index e26acd559..b8360b44a 100644 --- a/cmd/gitaly-git2go/commit/commit.go +++ b/cmd/gitaly-git2go/commit/commit.go @@ -8,7 +8,7 @@ import ( "errors" "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/create_directory.go b/cmd/gitaly-git2go/commit/create_directory.go index 061666ed3..7d6f80e82 100644 --- a/cmd/gitaly-git2go/commit/create_directory.go +++ b/cmd/gitaly-git2go/commit/create_directory.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/create_file.go b/cmd/gitaly-git2go/commit/create_file.go index 926916561..f960b9dec 100644 --- a/cmd/gitaly-git2go/commit/create_file.go +++ b/cmd/gitaly-git2go/commit/create_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/delete_file.go b/cmd/gitaly-git2go/commit/delete_file.go index a5af77b7b..440cec3b9 100644 --- a/cmd/gitaly-git2go/commit/delete_file.go +++ b/cmd/gitaly-git2go/commit/delete_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/move_file.go b/cmd/gitaly-git2go/commit/move_file.go index b31853c96..0a24e99cb 100644 --- a/cmd/gitaly-git2go/commit/move_file.go +++ b/cmd/gitaly-git2go/commit/move_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/update_file.go b/cmd/gitaly-git2go/commit/update_file.go index cea5d629b..1827ce865 100644 --- a/cmd/gitaly-git2go/commit/update_file.go +++ b/cmd/gitaly-git2go/commit/update_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/validate.go b/cmd/gitaly-git2go/commit/validate.go index ab3f972b1..83c68d0f9 100644 --- a/cmd/gitaly-git2go/commit/validate.go +++ b/cmd/gitaly-git2go/commit/validate.go @@ -5,7 +5,7 @@ package commit import ( "os" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/conflicts.go b/cmd/gitaly-git2go/conflicts.go index 954483cad..1970a2644 100644 --- a/cmd/gitaly-git2go/conflicts.go +++ b/cmd/gitaly-git2go/conflicts.go @@ -9,7 +9,7 @@ import ( "flag" "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/helper" diff --git a/cmd/gitaly-git2go/git2goutil/commit.go b/cmd/gitaly-git2go/git2goutil/commit.go index 7f45640ad..7302daa79 100644 --- a/cmd/gitaly-git2go/git2goutil/commit.go +++ b/cmd/gitaly-git2go/git2goutil/commit.go @@ -3,7 +3,7 @@ package git2goutil import ( "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" ) // CommitSubmitter is the helper struct to make signed Commits conveniently. diff --git a/cmd/gitaly-git2go/git2goutil/repo.go b/cmd/gitaly-git2go/git2goutil/repo.go index 259da77e8..1a1c4ede2 100644 --- a/cmd/gitaly-git2go/git2goutil/repo.go +++ b/cmd/gitaly-git2go/git2goutil/repo.go @@ -1,7 +1,7 @@ package git2goutil import ( - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" ) // OpenRepository opens the repository located at path as a Git2Go repository. diff --git a/cmd/gitaly-git2go/main.go b/cmd/gitaly-git2go/main.go index 8ee0e7fd0..5c8db9b23 100644 --- a/cmd/gitaly-git2go/main.go +++ b/cmd/gitaly-git2go/main.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "github.com/sirupsen/logrus" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" glog "gitlab.com/gitlab-org/gitaly/v15/internal/log" diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go index 21922b24a..036755b3b 100644 --- a/cmd/gitaly-git2go/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -10,7 +10,7 @@ import ( "fmt" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index 1ae181c2f..123b8cca6 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - libgit2 "github.com/libgit2/git2go/v33" + libgit2 "github.com/libgit2/git2go/v34" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" diff --git a/cmd/gitaly-git2go/rebase.go b/cmd/gitaly-git2go/rebase.go index 1fa23984e..0b06abc93 100644 --- a/cmd/gitaly-git2go/rebase.go +++ b/cmd/gitaly-git2go/rebase.go @@ -9,7 +9,7 @@ import ( "flag" "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/rebase_test.go b/cmd/gitaly-git2go/rebase_test.go index 2ef76db62..3f342cd3c 100644 --- a/cmd/gitaly-git2go/rebase_test.go +++ b/cmd/gitaly-git2go/rebase_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" gitalygit "gitlab.com/gitlab-org/gitaly/v15/internal/git" diff --git a/cmd/gitaly-git2go/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go index 6d05f59c7..8169410ec 100644 --- a/cmd/gitaly-git2go/resolve_conflicts.go +++ b/cmd/gitaly-git2go/resolve_conflicts.go @@ -12,7 +12,7 @@ import ( "strings" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git/conflict" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" diff --git a/cmd/gitaly-git2go/revert.go b/cmd/gitaly-git2go/revert.go index 725502289..7faf20a75 100644 --- a/cmd/gitaly-git2go/revert.go +++ b/cmd/gitaly-git2go/revert.go @@ -9,7 +9,7 @@ import ( "flag" "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/revert_test.go b/cmd/gitaly-git2go/revert_test.go index aa3d8df37..0c96988ee 100644 --- a/cmd/gitaly-git2go/revert_test.go +++ b/cmd/gitaly-git2go/revert_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" diff --git a/cmd/gitaly-git2go/submodule.go b/cmd/gitaly-git2go/submodule.go index 4596a5ff9..7a54abe7e 100644 --- a/cmd/gitaly-git2go/submodule.go +++ b/cmd/gitaly-git2go/submodule.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go/testhelper_test.go b/cmd/gitaly-git2go/testhelper_test.go index 274687cb6..b7614b867 100644 --- a/cmd/gitaly-git2go/testhelper_test.go +++ b/cmd/gitaly-git2go/testhelper_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" diff --git a/cmd/gitaly-git2go/util.go b/cmd/gitaly-git2go/util.go index 7a94371c3..a6ecd2a33 100644 --- a/cmd/gitaly-git2go/util.go +++ b/cmd/gitaly-git2go/util.go @@ -5,7 +5,7 @@ package main import ( "fmt" - git "github.com/libgit2/git2go/v33" + git "github.com/libgit2/git2go/v34" ) func lookupCommit(repo *git.Repository, ref string) (*git.Commit, error) { @@ -26,7 +26,7 @@ require ( github.com/jackc/pgtype v1.12.0 github.com/jackc/pgx/v4 v4.17.2 github.com/kelseyhightower/envconfig v1.4.0 - github.com/libgit2/git2go/v33 v33.0.9 + github.com/libgit2/git2go/v34 v34.0.0 github.com/olekukonko/tablewriter v0.0.5 github.com/opencontainers/runtime-spec v1.0.2 github.com/opentracing/opentracing-go v1.2.0 @@ -714,8 +714,8 @@ github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libgit2/git2go/v33 v33.0.9 h1:4ch2DJed6IhJO28BEohkUoGvxLsRzUjxljoNFJ6/O78= -github.com/libgit2/git2go/v33 v33.0.9/go.mod h1:KdpqkU+6+++4oHna/MIOgx4GCQ92IPCdpVRMRI80J+4= +github.com/libgit2/git2go/v34 v34.0.0 h1:UKoUaKLmiCRbOCD3PtUi2hD6hESSXzME/9OUZrGcgu8= +github.com/libgit2/git2go/v34 v34.0.0/go.mod h1:blVco2jDAw6YTXkErMMqzHLcAjKkwF0aWIRHBqiJkZ0= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20210210170715-a8dfcb80d3a7 h1:YjW+hUb8Fh2S58z4av4t/0cBMK/Q0aP48RocCFsC8yI= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20210210170715-a8dfcb80d3a7/go.mod h1:Spd59icnvRxSKuyijbbwe5AemzvcyXAUBgApa7VybMw= github.com/lightstep/lightstep-tracer-go v0.25.0 h1:sGVnz8h3jTQuHKMbUe2949nXm3Sg09N1UcR3VoQNN5E= |