Move gitaly-git2go to new package name

gitaly-git2go also had an appended major version number. This is not
necessary though. Remove the version number from the package name and
associated call sites.

Changelog: other

31 files changed, 26 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index b1471c249..0603ce491 100644
--- a/Makefile
+++ b/Makefile
@@ -278,8 +278,10 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES}
 
 gitaly:            GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
 praefect:          GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
-gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
-gitaly-git2go-v14: libgit2
+gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
+gitaly-git2go: libgit2
+gitaly-git2go-v14:
+	go install gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14@v14.10.0
 
 .PHONY: ${GITALY_EXECUTABLES}
 ${GITALY_EXECUTABLES}:
diff --git a/cmd/gitaly-git2go-v14/apply.go b/cmd/gitaly-git2go/apply.go
index 6c68ad6b5..c023c49c3 100644
--- a/cmd/gitaly-git2go-v14/apply.go
+++ b/cmd/gitaly-git2go/apply.go
@@ -16,7 +16,7 @@ import (
 	"path/filepath"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/cherry_pick.go b/cmd/gitaly-git2go/cherry_pick.go
index a2f6eb326..feb092840 100644
--- a/cmd/gitaly-git2go-v14/cherry_pick.go
+++ b/cmd/gitaly-git2go/cherry_pick.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/cherry_pick_test.go b/cmd/gitaly-git2go/cherry_pick_test.go
index 643660ea3..4068338d2 100644
--- a/cmd/gitaly-git2go-v14/cherry_pick_test.go
+++ b/cmd/gitaly-git2go/cherry_pick_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/testhelper"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg"
diff --git a/cmd/gitaly-git2go-v14/commit.go b/cmd/gitaly-git2go/commit.go
index 7b41a9491..0874b1b98 100644
--- a/cmd/gitaly-git2go-v14/commit.go
+++ b/cmd/gitaly-git2go/commit.go
@@ -8,7 +8,7 @@ import (
 	"encoding/gob"
 	"flag"
 
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/commit"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/commit"
 )
 
 type commitSubcommand struct{}
diff --git a/cmd/gitaly-git2go-v14/commit/change_file_mode.go b/cmd/gitaly-git2go/commit/change_file_mode.go
index d587688ec..d587688ec 100644
--- a/cmd/gitaly-git2go-v14/commit/change_file_mode.go
+++ b/cmd/gitaly-git2go/commit/change_file_mode.go
diff --git a/cmd/gitaly-git2go-v14/commit/commit.go b/cmd/gitaly-git2go/commit/commit.go
index 10dc92e05..cea6a6943 100644
--- a/cmd/gitaly-git2go-v14/commit/commit.go
+++ b/cmd/gitaly-git2go/commit/commit.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/commit/create_directory.go b/cmd/gitaly-git2go/commit/create_directory.go
index 7f1735d3b..7f1735d3b 100644
--- a/cmd/gitaly-git2go-v14/commit/create_directory.go
+++ b/cmd/gitaly-git2go/commit/create_directory.go
diff --git a/cmd/gitaly-git2go-v14/commit/create_file.go b/cmd/gitaly-git2go/commit/create_file.go
index a807e31a8..a807e31a8 100644
--- a/cmd/gitaly-git2go-v14/commit/create_file.go
+++ b/cmd/gitaly-git2go/commit/create_file.go
diff --git a/cmd/gitaly-git2go-v14/commit/delete_file.go b/cmd/gitaly-git2go/commit/delete_file.go
index 368fc0410..368fc0410 100644
--- a/cmd/gitaly-git2go-v14/commit/delete_file.go
+++ b/cmd/gitaly-git2go/commit/delete_file.go
diff --git a/cmd/gitaly-git2go-v14/commit/move_file.go b/cmd/gitaly-git2go/commit/move_file.go
index 39209630d..39209630d 100644
--- a/cmd/gitaly-git2go-v14/commit/move_file.go
+++ b/cmd/gitaly-git2go/commit/move_file.go
diff --git a/cmd/gitaly-git2go-v14/commit/update_file.go b/cmd/gitaly-git2go/commit/update_file.go
index 366d8329a..366d8329a 100644
--- a/cmd/gitaly-git2go-v14/commit/update_file.go
+++ b/cmd/gitaly-git2go/commit/update_file.go
diff --git a/cmd/gitaly-git2go-v14/commit/validate.go b/cmd/gitaly-git2go/commit/validate.go
index 0addabcdc..0addabcdc 100644
--- a/cmd/gitaly-git2go-v14/commit/validate.go
+++ b/cmd/gitaly-git2go/commit/validate.go
diff --git a/cmd/gitaly-git2go-v14/conflicts.go b/cmd/gitaly-git2go/conflicts.go
index 57c5292a1..c0401928f 100644
--- a/cmd/gitaly-git2go-v14/conflicts.go
+++ b/cmd/gitaly-git2go/conflicts.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"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-v14/conflicts_test.go b/cmd/gitaly-git2go/conflicts_test.go
index e14a164b2..b50609971 100644
--- a/cmd/gitaly-git2go-v14/conflicts_test.go
+++ b/cmd/gitaly-git2go/conflicts_test.go
@@ -9,7 +9,7 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/testhelper"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
 	glgit "gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
diff --git a/cmd/gitaly-git2go-v14/git2goutil/repo.go b/cmd/gitaly-git2go/git2goutil/repo.go
index 259da77e8..259da77e8 100644
--- a/cmd/gitaly-git2go-v14/git2goutil/repo.go
+++ b/cmd/gitaly-git2go/git2goutil/repo.go
diff --git a/cmd/gitaly-git2go-v14/main.go b/cmd/gitaly-git2go/main.go
index 6c044ae0a..6c044ae0a 100644
--- a/cmd/gitaly-git2go-v14/main.go
+++ b/cmd/gitaly-git2go/main.go
diff --git a/cmd/gitaly-git2go-v14/merge.go b/cmd/gitaly-git2go/merge.go
index 23f21f550..e80628575 100644
--- a/cmd/gitaly-git2go-v14/merge.go
+++ b/cmd/gitaly-git2go/merge.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/merge_test.go b/cmd/gitaly-git2go/merge_test.go
index 30de8f4a9..24ffc4d16 100644
--- a/cmd/gitaly-git2go-v14/merge_test.go
+++ b/cmd/gitaly-git2go/merge_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/testhelper"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
diff --git a/cmd/gitaly-git2go-v14/rebase.go b/cmd/gitaly-git2go/rebase.go
index c8f21394e..254ddbfb3 100644
--- a/cmd/gitaly-git2go-v14/rebase.go
+++ b/cmd/gitaly-git2go/rebase.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/rebase_test.go b/cmd/gitaly-git2go/rebase_test.go
index db7f334c4..357964fad 100644
--- a/cmd/gitaly-git2go-v14/rebase_test.go
+++ b/cmd/gitaly-git2go/rebase_test.go
@@ -10,8 +10,8 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/testhelper"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
 	gitalygit "gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
diff --git a/cmd/gitaly-git2go-v14/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go
index 0b1343ba1..decbef65a 100644
--- a/cmd/gitaly-git2go-v14/resolve_conflicts.go
+++ b/cmd/gitaly-git2go/resolve_conflicts.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git/conflict"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
diff --git a/cmd/gitaly-git2go-v14/revert.go b/cmd/gitaly-git2go/revert.go
index 63f630147..1fb9c7b81 100644
--- a/cmd/gitaly-git2go-v14/revert.go
+++ b/cmd/gitaly-git2go/revert.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/revert_test.go b/cmd/gitaly-git2go/revert_test.go
index e421cf670..9252d11e7 100644
--- a/cmd/gitaly-git2go-v14/revert_test.go
+++ b/cmd/gitaly-git2go/revert_test.go
@@ -11,8 +11,8 @@ import (
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
-	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/testhelper"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
+	cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper/testcfg"
diff --git a/cmd/gitaly-git2go-v14/submodule.go b/cmd/gitaly-git2go/submodule.go
index e6485c2e6..64df9c16c 100644
--- a/cmd/gitaly-git2go-v14/submodule.go
+++ b/cmd/gitaly-git2go/submodule.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	git "github.com/libgit2/git2go/v33"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 	"gitlab.com/gitlab-org/gitaly/internal/git2go"
 )
 
diff --git a/cmd/gitaly-git2go-v14/submodule_test.go b/cmd/gitaly-git2go/submodule_test.go
index 2d8e9d0ef..2d8e9d0ef 100644
--- a/cmd/gitaly-git2go-v14/submodule_test.go
+++ b/cmd/gitaly-git2go/submodule_test.go
diff --git a/cmd/gitaly-git2go-v14/testhelper/testhelper.go b/cmd/gitaly-git2go/testhelper/testhelper.go
index e1c0b372d..c0c110ac3 100644
--- a/cmd/gitaly-git2go-v14/testhelper/testhelper.go
+++ b/cmd/gitaly-git2go/testhelper/testhelper.go
@@ -9,7 +9,7 @@ import (
 
 	git "github.com/libgit2/git2go/v33"
 	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go-v14/git2goutil"
+	"gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/git2goutil"
 )
 
 // DefaultAuthor is the author used by BuildCommit
diff --git a/cmd/gitaly-git2go-v14/testhelper_test.go b/cmd/gitaly-git2go/testhelper_test.go
index a27531fee..a27531fee 100644
--- a/cmd/gitaly-git2go-v14/testhelper_test.go
+++ b/cmd/gitaly-git2go/testhelper_test.go
diff --git a/cmd/gitaly-git2go-v14/util.go b/cmd/gitaly-git2go/util.go
index feed724ab..feed724ab 100644
--- a/cmd/gitaly-git2go-v14/util.go
+++ b/cmd/gitaly-git2go/util.go
diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go
index cbeefbda8..941e3fc16 100644
--- a/internal/git2go/executor.go
+++ b/internal/git2go/executor.go
@@ -17,7 +17,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/storage"
 	glog "gitlab.com/gitlab-org/gitaly/internal/log"
-	"gitlab.com/gitlab-org/gitaly/internal/version"
 	"gitlab.com/gitlab-org/labkit/correlation"
 )
 
@@ -26,7 +25,7 @@ var (
 	ErrInvalidArgument = errors.New("invalid parameters")
 
 	// BinaryName is a binary name with version suffix .
-	BinaryName = "gitaly-git2go-" + version.GetModuleVersion()
+	BinaryName = "gitaly-git2go"
 )
 
 // Executor executes gitaly-git2go.
diff --git a/internal/testhelper/testcfg/build.go b/internal/testhelper/testcfg/build.go
index 3e1565cfd..387a323d1 100644
--- a/internal/testhelper/testcfg/build.go
+++ b/internal/testhelper/testcfg/build.go
@@ -16,7 +16,7 @@ var buildOnceByName sync.Map
 
 // BuildGitalyGit2Go builds the gitaly-git2go command and installs it into the binary directory.
 func BuildGitalyGit2Go(t testing.TB, cfg config.Cfg) string {
-	return BuildBinary(t, cfg.BinDir, gitalyCommandPath("gitaly-git2go-v14"))
+	return BuildBinary(t, cfg.BinDir, gitalyCommandPath("gitaly-git2go"))
 }
 
 // BuildGitalyWrapper builds the gitaly-wrapper command and installs it into the binary directory.