gitaly-git2go: Change the package name from v14 to v15

28 files changed, 70 insertions, 70 deletions

diff --git a/cmd/gitaly-git2go-v14/apply.go b/cmd/gitaly-git2go-v15/apply.go
index fd3d9eb71..32ee50e72 100644
--- a/cmd/gitaly-git2go-v14/apply.go
+++ b/cmd/gitaly-git2go-v15/apply.go
@@ -16,8 +16,8 @@ import (
 	"path/filepath"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type patchIterator struct {
diff --git a/cmd/gitaly-git2go-v14/cherry_pick.go b/cmd/gitaly-git2go-v15/cherry_pick.go
index 605abcc39..d94748363 100644
--- a/cmd/gitaly-git2go-v14/cherry_pick.go
+++ b/cmd/gitaly-git2go-v15/cherry_pick.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type cherryPickSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/cherry_pick_test.go b/cmd/gitaly-git2go-v15/cherry_pick_test.go
index a578893ca..5902d1fdf 100644
--- a/cmd/gitaly-git2go-v14/cherry_pick_test.go
+++ b/cmd/gitaly-git2go-v15/cherry_pick_test.go
@@ -11,11 +11,11 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 )
 
 func TestCherryPick_validation(t *testing.T) {
diff --git a/cmd/gitaly-git2go-v14/commit.go b/cmd/gitaly-git2go-v15/commit.go
index 1b8f010c2..540135256 100644
--- a/cmd/gitaly-git2go-v14/commit.go
+++ b/cmd/gitaly-git2go-v15/commit.go
@@ -8,7 +8,7 @@ import (
 	"encoding/gob"
 	"flag"
 
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/commit"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/commit"
 )
 
 type commitSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/commit/change_file_mode.go b/cmd/gitaly-git2go-v15/commit/change_file_mode.go
index 74d27c142..6e70b0c5a 100644
--- a/cmd/gitaly-git2go-v14/commit/change_file_mode.go
+++ b/cmd/gitaly-git2go-v15/commit/change_file_mode.go
@@ -5,7 +5,7 @@ package commit
 
 import (
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyChangeFileMode(action git2go.ChangeFileMode, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/commit.go b/cmd/gitaly-git2go-v15/commit/commit.go
index 2992dc7f3..51f6020bc 100644
--- a/cmd/gitaly-git2go-v14/commit/commit.go
+++ b/cmd/gitaly-git2go-v15/commit/commit.go
@@ -10,8 +10,8 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 // Run runs the commit subcommand.
diff --git a/cmd/gitaly-git2go-v14/commit/create_directory.go b/cmd/gitaly-git2go-v15/commit/create_directory.go
index cb9da2a22..fa1ecd742 100644
--- a/cmd/gitaly-git2go-v14/commit/create_directory.go
+++ b/cmd/gitaly-git2go-v15/commit/create_directory.go
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyCreateDirectory(action git2go.CreateDirectory, repo *git.Repository, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/create_file.go b/cmd/gitaly-git2go-v15/commit/create_file.go
index 4aafc6f18..fe88d45e5 100644
--- a/cmd/gitaly-git2go-v14/commit/create_file.go
+++ b/cmd/gitaly-git2go-v15/commit/create_file.go
@@ -5,7 +5,7 @@ package commit
 
 import (
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyCreateFile(action git2go.CreateFile, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/delete_file.go b/cmd/gitaly-git2go-v15/commit/delete_file.go
index a8a3ad870..62601235d 100644
--- a/cmd/gitaly-git2go-v14/commit/delete_file.go
+++ b/cmd/gitaly-git2go-v15/commit/delete_file.go
@@ -5,7 +5,7 @@ package commit
 
 import (
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyDeleteFile(action git2go.DeleteFile, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/move_file.go b/cmd/gitaly-git2go-v15/commit/move_file.go
index 2bdf114d8..9a6a290d6 100644
--- a/cmd/gitaly-git2go-v14/commit/move_file.go
+++ b/cmd/gitaly-git2go-v15/commit/move_file.go
@@ -5,7 +5,7 @@ package commit
 
 import (
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyMoveFile(action git2go.MoveFile, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/update_file.go b/cmd/gitaly-git2go-v15/commit/update_file.go
index 1972872bd..6c2ef74a3 100644
--- a/cmd/gitaly-git2go-v14/commit/update_file.go
+++ b/cmd/gitaly-git2go-v15/commit/update_file.go
@@ -5,7 +5,7 @@ package commit
 
 import (
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func applyUpdateFile(action git2go.UpdateFile, index *git.Index) error {
diff --git a/cmd/gitaly-git2go-v14/commit/validate.go b/cmd/gitaly-git2go-v15/commit/validate.go
index 52b2faaff..706ae45ce 100644
--- a/cmd/gitaly-git2go-v14/commit/validate.go
+++ b/cmd/gitaly-git2go-v15/commit/validate.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 func validateFileExists(index *git.Index, path string) error {
diff --git a/cmd/gitaly-git2go-v14/conflicts.go b/cmd/gitaly-git2go-v15/conflicts.go
index 1923fec42..a569533c1 100644
--- a/cmd/gitaly-git2go-v14/conflicts.go
+++ b/cmd/gitaly-git2go-v15/conflicts.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/helper"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/helper"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/cmd/gitaly-git2go-v14/conflicts_test.go b/cmd/gitaly-git2go-v15/conflicts_test.go
index b7e3adeb2..6fa843aa6 100644
--- a/cmd/gitaly-git2go-v14/conflicts_test.go
+++ b/cmd/gitaly-git2go-v15/conflicts_test.go
@@ -9,11 +9,11 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
-	glgit "gitlab.com/gitlab-org/gitaly/v14/internal/git"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/testhelper"
+	glgit "gitlab.com/gitlab-org/gitaly/v15/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
diff --git a/cmd/gitaly-git2go-v14/git2goutil/repo.go b/cmd/gitaly-git2go-v15/git2goutil/repo.go
index 259da77e8..259da77e8 100644
--- a/cmd/gitaly-git2go-v14/git2goutil/repo.go
+++ b/cmd/gitaly-git2go-v15/git2goutil/repo.go
diff --git a/cmd/gitaly-git2go-v14/main.go b/cmd/gitaly-git2go-v15/main.go
index 3f403c9d4..dc3516af2 100644
--- a/cmd/gitaly-git2go-v14/main.go
+++ b/cmd/gitaly-git2go-v15/main.go
@@ -13,8 +13,8 @@ import (
 	"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
 	git "github.com/libgit2/git2go/v33"
 	"github.com/sirupsen/logrus"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	glog "gitlab.com/gitlab-org/gitaly/v14/internal/log"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	glog "gitlab.com/gitlab-org/gitaly/v15/internal/log"
 	"gitlab.com/gitlab-org/labkit/correlation"
 )
 
diff --git a/cmd/gitaly-git2go-v14/merge.go b/cmd/gitaly-git2go-v15/merge.go
index 14589c96c..313a22f4e 100644
--- a/cmd/gitaly-git2go-v14/merge.go
+++ b/cmd/gitaly-git2go-v15/merge.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type mergeSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/merge_test.go b/cmd/gitaly-git2go-v15/merge_test.go
index 708a010b8..68d36b9f7 100644
--- a/cmd/gitaly-git2go-v14/merge_test.go
+++ b/cmd/gitaly-git2go-v15/merge_test.go
@@ -11,12 +11,12 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 )
 
 func TestMerge_missingArguments(t *testing.T) {
diff --git a/cmd/gitaly-git2go-v14/rebase.go b/cmd/gitaly-git2go-v15/rebase.go
index 1c2e9acd0..a385094e9 100644
--- a/cmd/gitaly-git2go-v14/rebase.go
+++ b/cmd/gitaly-git2go-v15/rebase.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type rebaseSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/rebase_test.go b/cmd/gitaly-git2go-v15/rebase_test.go
index f3756e9f6..a596876f6 100644
--- a/cmd/gitaly-git2go-v14/rebase_test.go
+++ b/cmd/gitaly-git2go-v15/rebase_test.go
@@ -10,13 +10,13 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
-	gitalygit "gitlab.com/gitlab-org/gitaly/v14/internal/git"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/testhelper"
+	gitalygit "gitlab.com/gitlab-org/gitaly/v15/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 )
 
 var masterRevision = "1e292f8fedd741b75372e19097c76d327140c312"
diff --git a/cmd/gitaly-git2go-v14/resolve_conflicts.go b/cmd/gitaly-git2go-v15/resolve_conflicts.go
index 13c06243e..ff73ee749 100644
--- a/cmd/gitaly-git2go-v14/resolve_conflicts.go
+++ b/cmd/gitaly-git2go-v15/resolve_conflicts.go
@@ -14,9 +14,9 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/conflict"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/conflict"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type resolveSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/revert.go b/cmd/gitaly-git2go-v15/revert.go
index acb9e9d3d..8c84f909f 100644
--- a/cmd/gitaly-git2go-v14/revert.go
+++ b/cmd/gitaly-git2go-v15/revert.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type revertSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/revert_test.go b/cmd/gitaly-git2go-v15/revert_test.go
index fb0235e60..aa85689f5 100644
--- a/cmd/gitaly-git2go-v14/revert_test.go
+++ b/cmd/gitaly-git2go-v15/revert_test.go
@@ -11,11 +11,11 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 )
 
 func TestRevert_validation(t *testing.T) {
diff --git a/cmd/gitaly-git2go-v14/submodule.go b/cmd/gitaly-git2go-v15/submodule.go
index 24e3fef7e..08c893cef 100644
--- a/cmd/gitaly-git2go-v14/submodule.go
+++ b/cmd/gitaly-git2go-v15/submodule.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
 )
 
 type submoduleSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/submodule_test.go b/cmd/gitaly-git2go-v15/submodule_test.go
index 98ba9cbe6..3669a1559 100644
--- a/cmd/gitaly-git2go-v14/submodule_test.go
+++ b/cmd/gitaly-git2go-v15/submodule_test.go
@@ -9,13 +9,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/localrepo"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/lstree"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper/testcfg"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/localrepo"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git/lstree"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/git2go"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper/testcfg"
 )
 
 func TestSubmodule(t *testing.T) {
diff --git a/cmd/gitaly-git2go-v14/testhelper/testhelper.go b/cmd/gitaly-git2go-v15/testhelper/testhelper.go
index 0b3a5e9e5..7ba1e65cd 100644
--- a/cmd/gitaly-git2go-v14/testhelper/testhelper.go
+++ b/cmd/gitaly-git2go-v15/testhelper/testhelper.go
@@ -9,7 +9,7 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil"
 )
 
 // DefaultAuthor is the author used by BuildCommit
diff --git a/cmd/gitaly-git2go-v14/testhelper_test.go b/cmd/gitaly-git2go-v15/testhelper_test.go
index 826c9250f..39c0dad26 100644
--- a/cmd/gitaly-git2go-v14/testhelper_test.go
+++ b/cmd/gitaly-git2go-v15/testhelper_test.go
@@ -6,10 +6,10 @@ package main
 import (
 	"testing"
 
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git/gittest"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/git2go"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/config"
-	"gitlab.com/gitlab-org/gitaly/v14/internal/testhelper"
+	"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"
+	"gitlab.com/gitlab-org/gitaly/v15/internal/testhelper"
 )
 
 func TestMain(m *testing.M) {
diff --git a/cmd/gitaly-git2go-v14/util.go b/cmd/gitaly-git2go-v15/util.go
index feed724ab..feed724ab 100644
--- a/cmd/gitaly-git2go-v14/util.go
+++ b/cmd/gitaly-git2go-v15/util.go