bump git2go to v31
I tested it here locally and it seems to work fine. we updated our system library to libgit2 1.1.0, which then requires git2go v31.x
diff --git a/Makefile b/Makefile
index 4e128a5a..5da434e7 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ GOLANGCI_LINT_VERSION ?= 1.31.0
PROTOC_VERSION ?= 3.12.4
PROTOC_GEN_GO_VERSION ?= 1.3.2
GIT_VERSION ?= v2.29.0
-GIT2GO_VERSION ?= v30
+GIT2GO_VERSION ?= v31
LIBGIT2_VERSION ?= v1.0.1
GOCOVER_COBERTURA_VERSION ?= aaee18c8195c3f2d90e5ef80ca918d265463842a
diff --git a/cmd/gitaly-git2go/commit/change_file_mode.go b/cmd/gitaly-git2go/commit/change_file_mode.go
index 17200ee3..3628e32f 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/commit.go b/cmd/gitaly-git2go/commit/commit.go
index 90862e1a..e6d725d1 100644
--- a/cmd/gitaly-git2go/commit/commit.go
+++ b/cmd/gitaly-git2go/commit/commit.go
@@ -9,7 +9,7 @@ import (
"fmt"
"io"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/create_directory.go b/cmd/gitaly-git2go/commit/create_directory.go
index c7059c0a..91ee783b 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/create_file.go b/cmd/gitaly-git2go/commit/create_file.go
index 62bc6f61..abf92fa8 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/delete_file.go b/cmd/gitaly-git2go/commit/delete_file.go
index 0c9df3be..7a5b2a97 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/move_file.go b/cmd/gitaly-git2go/commit/move_file.go
index e9c11508..67ca0543 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/update_file.go b/cmd/gitaly-git2go/commit/update_file.go
index 0bf6e751..31bacf4d 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/commit/validate.go b/cmd/gitaly-git2go/commit/validate.go
index 8854cdbb..7506ee2a 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/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/conflicts/conflicts.go b/cmd/gitaly-git2go/conflicts/conflicts.go
index ac29e68c..9952412b 100644
--- a/cmd/gitaly-git2go/conflicts/conflicts.go
+++ b/cmd/gitaly-git2go/conflicts/conflicts.go
@@ -10,7 +10,7 @@ import (
"io"
"os"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
"gitlab.com/gitlab-org/gitaly/internal/helper"
"google.golang.org/grpc/codes"
diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go
index 5a9f10a7..8865b995 100644
--- a/cmd/gitaly-git2go/merge.go
+++ b/cmd/gitaly-git2go/merge.go
@@ -11,7 +11,7 @@ import (
"os"
"time"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go
index 0a2b6bba..e05d47b3 100644
--- a/cmd/gitaly-git2go/merge_test.go
+++ b/cmd/gitaly-git2go/merge_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
diff --git a/cmd/gitaly-git2go/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go
index 7500fae8..380813fc 100644
--- a/cmd/gitaly-git2go/resolve_conflicts.go
+++ b/cmd/gitaly-git2go/resolve_conflicts.go
@@ -13,7 +13,7 @@ import (
"strings"
"time"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git/conflict"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/revert.go b/cmd/gitaly-git2go/revert.go
index 8ef9dcff..61f1f057 100644
--- a/cmd/gitaly-git2go/revert.go
+++ b/cmd/gitaly-git2go/revert.go
@@ -10,7 +10,7 @@ import (
"fmt"
"io"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/revert_test.go b/cmd/gitaly-git2go/revert_test.go
index 790ad585..8a083270 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/v30"
+ git "github.com/libgit2/git2go/v31"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
diff --git a/cmd/gitaly-git2go/submodule.go b/cmd/gitaly-git2go/submodule.go
index d256188b..b46bc92b 100644
--- a/cmd/gitaly-git2go/submodule.go
+++ b/cmd/gitaly-git2go/submodule.go
@@ -9,7 +9,7 @@ import (
"io"
"time"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"gitlab.com/gitlab-org/gitaly/internal/git2go"
)
diff --git a/cmd/gitaly-git2go/testhelper/testhelper.go b/cmd/gitaly-git2go/testhelper/testhelper.go
index 3a7a24b0..429ff1f0 100644
--- a/cmd/gitaly-git2go/testhelper/testhelper.go
+++ b/cmd/gitaly-git2go/testhelper/testhelper.go
@@ -6,7 +6,7 @@ import (
"testing"
"time"
- git "github.com/libgit2/git2go/v30"
+ git "github.com/libgit2/git2go/v31"
"github.com/stretchr/testify/require"
)
diff --git a/cmd/gitaly-git2go/util.go b/cmd/gitaly-git2go/util.go
index a315c5f3..31dfa281 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/v30"
+ git "github.com/libgit2/git2go/v31"
)
func lookupCommit(repo *git.Repository, ref string) (*git.Commit, error) {