global: Drop dependency on the Git2go executor

None of our services require the Git2go executor anymore, but we still
inject it into the various services. Remove it.

27 files changed, 16 insertions, 66 deletions

diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go
index 825bb19d8..989c175c3 100644
--- a/internal/cli/gitaly/serve.go
+++ b/internal/cli/gitaly/serve.go
@@ -23,7 +23,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/sentry"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
@@ -320,8 +319,6 @@ func run(cfg config.Cfg, logger logrus.FieldLogger) error {
 	)
 	defer gitalyServerFactory.Stop()
 
-	git2goExecutor := git2go.NewExecutor(cfg, gitCmdFactory, locator, logger)
-
 	updaterWithHooks := updateref.NewUpdaterWithHooks(cfg, locator, hookManager, gitCmdFactory, catfileCache)
 
 	streamCache := streamcache.New(cfg.PackObjectsCache, logger)
@@ -375,7 +372,6 @@ func run(cfg config.Cfg, logger logrus.FieldLogger) error {
 			PackObjectsCache:    streamCache,
 			PackObjectsLimiter:  packObjectsLimiter,
 			RepositoryCounter:   repoCounter,
-			Git2goExecutor:      git2goExecutor,
 			UpdaterWithHooks:    updaterWithHooks,
 			HousekeepingManager: housekeepingManager,
 			BackupSink:          backupSink,
diff --git a/internal/git/localrepo/remote_extra_test.go b/internal/git/localrepo/remote_extra_test.go
index 0dcd2188e..4e4f693ce 100644
--- a/internal/git/localrepo/remote_extra_test.go
+++ b/internal/git/localrepo/remote_extra_test.go
@@ -48,7 +48,6 @@ func TestRepo_FetchInternal(t *testing.T) {
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/git/remoterepo/testhelper_test.go b/internal/git/remoterepo/testhelper_test.go
index ebac4880c..2a9b0ce9b 100644
--- a/internal/git/remoterepo/testhelper_test.go
+++ b/internal/git/remoterepo/testhelper_test.go
@@ -30,7 +30,6 @@ func setupGitalyServer(t *testing.T) config.Cfg {
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/blob/testhelper_test.go b/internal/gitaly/service/blob/testhelper_test.go
index bf76a55cc..4ca1a85ae 100644
--- a/internal/gitaly/service/blob/testhelper_test.go
+++ b/internal/gitaly/service/blob/testhelper_test.go
@@ -36,7 +36,6 @@ func setup(tb testing.TB, ctx context.Context) (config.Cfg, gitalypb.BlobService
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/cleanup/testhelper_test.go b/internal/gitaly/service/cleanup/testhelper_test.go
index 074a9052a..00f7a107a 100644
--- a/internal/gitaly/service/cleanup/testhelper_test.go
+++ b/internal/gitaly/service/cleanup/testhelper_test.go
@@ -54,7 +54,6 @@ func runCleanupServiceServer(t *testing.T, cfg config.Cfg) string {
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/commit/testhelper_test.go b/internal/gitaly/service/commit/testhelper_test.go
index d0b457d0e..44356057a 100644
--- a/internal/gitaly/service/commit/testhelper_test.go
+++ b/internal/gitaly/service/commit/testhelper_test.go
@@ -53,7 +53,6 @@ func startTestServices(tb testing.TB, cfg config.Cfg, opts ...testserver.GitalyS
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/conflicts/testhelper_test.go b/internal/gitaly/service/conflicts/testhelper_test.go
index 813826e52..1d1b2f6e8 100644
--- a/internal/gitaly/service/conflicts/testhelper_test.go
+++ b/internal/gitaly/service/conflicts/testhelper_test.go
@@ -51,7 +51,6 @@ func runConflictsServer(tb testing.TB, cfg config.Cfg, hookManager hook.Manager)
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/dependencies.go b/internal/gitaly/service/dependencies.go
index 664aeca96..d0f568af3 100644
--- a/internal/gitaly/service/dependencies.go
+++ b/internal/gitaly/service/dependencies.go
@@ -7,7 +7,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	gitalyhook "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref"
@@ -38,7 +37,6 @@ type Dependencies struct {
 	PackObjectsLimiter  limiter.Limiter
 	LimitHandler        *limithandler.LimiterMiddleware
 	RepositoryCounter   *counter.RepositoryCounter
-	Git2goExecutor      *git2go.Executor
 	UpdaterWithHooks    *updateref.UpdaterWithHooks
 	HousekeepingManager housekeeping.Manager
 	PartitionManager    *storagemgr.PartitionManager
@@ -111,11 +109,6 @@ func (dc *Dependencies) GetRepositoryCounter() *counter.RepositoryCounter {
 	return dc.RepositoryCounter
 }
 
-// GetGit2goExecutor returns the git2go executor.
-func (dc *Dependencies) GetGit2goExecutor() *git2go.Executor {
-	return dc.Git2goExecutor
-}
-
 // GetUpdaterWithHooks returns the updater with hooks executor.
 func (dc *Dependencies) GetUpdaterWithHooks() *updateref.UpdaterWithHooks {
 	return dc.UpdaterWithHooks
diff --git a/internal/gitaly/service/diff/testhelper_test.go b/internal/gitaly/service/diff/testhelper_test.go
index e19294090..4bde0b629 100644
--- a/internal/gitaly/service/diff/testhelper_test.go
+++ b/internal/gitaly/service/diff/testhelper_test.go
@@ -35,7 +35,6 @@ func setupDiffService(tb testing.TB, opt ...testserver.GitalyServerOpt) (config.
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/hook/testhelper_test.go b/internal/gitaly/service/hook/testhelper_test.go
index 51404398e..95c2de53e 100644
--- a/internal/gitaly/service/hook/testhelper_test.go
+++ b/internal/gitaly/service/hook/testhelper_test.go
@@ -73,7 +73,6 @@ func runHooksServer(tb testing.TB, cfg config.Cfg, opts []serverOption, serverOp
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/objectpool/testhelper_test.go b/internal/gitaly/service/objectpool/testhelper_test.go
index 48a5e2967..a20c28ed1 100644
--- a/internal/gitaly/service/objectpool/testhelper_test.go
+++ b/internal/gitaly/service/objectpool/testhelper_test.go
@@ -85,7 +85,6 @@ func runObjectPoolServer(t *testing.T, cfg config.Cfg, locator storage.Locator,
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/operations/server.go b/internal/gitaly/service/operations/server.go
index 06386828a..b96e1ab18 100644
--- a/internal/gitaly/service/operations/server.go
+++ b/internal/gitaly/service/operations/server.go
@@ -8,7 +8,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/catfile"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook/updateref"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
@@ -20,15 +19,14 @@ import (
 //nolint:revive // This is unintentionally missing documentation.
 type Server struct {
 	gitalypb.UnimplementedOperationServiceServer
-	hookManager    hook.Manager
-	txManager      transaction.Manager
-	locator        storage.Locator
-	conns          *client.Pool
-	git2goExecutor *git2go.Executor
-	gitCmdFactory  git.CommandFactory
-	catfileCache   catfile.Cache
-	updater        *updateref.UpdaterWithHooks
-	signingKey     string
+	hookManager   hook.Manager
+	txManager     transaction.Manager
+	locator       storage.Locator
+	conns         *client.Pool
+	gitCmdFactory git.CommandFactory
+	catfileCache  catfile.Cache
+	updater       *updateref.UpdaterWithHooks
+	signingKey    string
 }
 
 // NewServer creates a new instance of a grpc OperationServiceServer
@@ -37,22 +35,20 @@ func NewServer(
 	txManager transaction.Manager,
 	locator storage.Locator,
 	conns *client.Pool,
-	git2goExecutor *git2go.Executor,
 	gitCmdFactory git.CommandFactory,
 	catfileCache catfile.Cache,
 	updater *updateref.UpdaterWithHooks,
 	signingKey string,
 ) *Server {
 	return &Server{
-		hookManager:    hookManager,
-		txManager:      txManager,
-		locator:        locator,
-		conns:          conns,
-		git2goExecutor: git2goExecutor,
-		gitCmdFactory:  gitCmdFactory,
-		catfileCache:   catfileCache,
-		updater:        updater,
-		signingKey:     signingKey,
+		hookManager:   hookManager,
+		txManager:     txManager,
+		locator:       locator,
+		conns:         conns,
+		gitCmdFactory: gitCmdFactory,
+		catfileCache:  catfileCache,
+		updater:       updater,
+		signingKey:    signingKey,
 	}
 }
 
diff --git a/internal/gitaly/service/operations/testhelper_test.go b/internal/gitaly/service/operations/testhelper_test.go
index a21c8b995..e4bb99929 100644
--- a/internal/gitaly/service/operations/testhelper_test.go
+++ b/internal/gitaly/service/operations/testhelper_test.go
@@ -86,7 +86,6 @@ func runOperationServiceServer(tb testing.TB, cfg config.Cfg, options ...testser
 			deps.GetTxManager(),
 			deps.GetLocator(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetUpdaterWithHooks(),
@@ -108,7 +107,6 @@ func runOperationServiceServer(tb testing.TB, cfg config.Cfg, options ...testser
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/operations/user_create_branch_test.go b/internal/gitaly/service/operations/user_create_branch_test.go
index 5fdd93f16..c6e8aa854 100644
--- a/internal/gitaly/service/operations/user_create_branch_test.go
+++ b/internal/gitaly/service/operations/user_create_branch_test.go
@@ -128,7 +128,6 @@ func TestUserCreateBranch_transactions(t *testing.T) {
 			deps.GetTxManager(),
 			deps.GetLocator(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetUpdaterWithHooks(),
diff --git a/internal/gitaly/service/operations/user_delete_branch_test.go b/internal/gitaly/service/operations/user_delete_branch_test.go
index 686778e0a..e71780551 100644
--- a/internal/gitaly/service/operations/user_delete_branch_test.go
+++ b/internal/gitaly/service/operations/user_delete_branch_test.go
@@ -451,7 +451,6 @@ func TestUserDeleteBranch_transaction(t *testing.T) {
 			deps.GetTxManager(),
 			deps.GetLocator(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetUpdaterWithHooks(),
diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go
index 48c12eb82..ccd53fb3c 100644
--- a/internal/gitaly/service/ref/delete_refs_test.go
+++ b/internal/gitaly/service/ref/delete_refs_test.go
@@ -119,7 +119,6 @@ func TestDeleteRefs_transaction(t *testing.T) {
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/ref/testhelper_test.go b/internal/gitaly/service/ref/testhelper_test.go
index d2f077855..a80dc7dcf 100644
--- a/internal/gitaly/service/ref/testhelper_test.go
+++ b/internal/gitaly/service/ref/testhelper_test.go
@@ -66,7 +66,6 @@ func runRefServiceServer(tb testing.TB, cfg config.Cfg) string {
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/remote/testhelper_test.go b/internal/gitaly/service/remote/testhelper_test.go
index 863d7f4d2..cf71f9860 100644
--- a/internal/gitaly/service/remote/testhelper_test.go
+++ b/internal/gitaly/service/remote/testhelper_test.go
@@ -39,7 +39,6 @@ func setupRemoteService(t *testing.T, ctx context.Context, opts ...testserver.Gi
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go
index d295fbe6e..fdf94702c 100644
--- a/internal/gitaly/service/remote/update_remote_mirror_test.go
+++ b/internal/gitaly/service/remote/update_remote_mirror_test.go
@@ -587,7 +587,6 @@ func TestUpdateRemoteMirror(t *testing.T) {
 					deps.GetGitCmdFactory(),
 					deps.GetCatfileCache(),
 					deps.GetConnsPool(),
-					deps.GetGit2goExecutor(),
 					deps.GetHousekeepingManager(),
 					deps.GetBackupSink(),
 					deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/repository/server.go b/internal/gitaly/service/repository/server.go
index aafcf2a9f..0e354b2d1 100644
--- a/internal/gitaly/service/repository/server.go
+++ b/internal/gitaly/service/repository/server.go
@@ -10,7 +10,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/quarantine"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage/counter"
@@ -29,7 +28,6 @@ type server struct {
 	cfg                 config.Cfg
 	loggingCfg          config.Logging
 	catfileCache        catfile.Cache
-	git2goExecutor      *git2go.Executor
 	housekeepingManager housekeeping.Manager
 	backupSink          backup.Sink
 	backupLocator       backup.Locator
@@ -46,7 +44,6 @@ func NewServer(
 	gitCmdFactory git.CommandFactory,
 	catfileCache catfile.Cache,
 	connsPool *client.Pool,
-	git2goExecutor *git2go.Executor,
 	housekeepingManager housekeeping.Manager,
 	backupSink backup.Sink,
 	backupLocator backup.Locator,
@@ -60,7 +57,6 @@ func NewServer(
 		cfg:                 cfg,
 		loggingCfg:          cfg.Logging,
 		catfileCache:        catfileCache,
-		git2goExecutor:      git2goExecutor,
 		housekeepingManager: housekeepingManager,
 		backupSink:          backupSink,
 		backupLocator:       backupLocator,
diff --git a/internal/gitaly/service/repository/testhelper_test.go b/internal/gitaly/service/repository/testhelper_test.go
index ec0bd90e5..ba57b32e7 100644
--- a/internal/gitaly/service/repository/testhelper_test.go
+++ b/internal/gitaly/service/repository/testhelper_test.go
@@ -63,7 +63,6 @@ func runRepositoryService(tb testing.TB, cfg config.Cfg, opts ...testserver.Gita
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/setup/register.go b/internal/gitaly/service/setup/register.go
index 08a047a7b..b14298f1a 100644
--- a/internal/gitaly/service/setup/register.go
+++ b/internal/gitaly/service/setup/register.go
@@ -79,7 +79,6 @@ func RegisterAll(srv *grpc.Server, deps *service.Dependencies) {
 		deps.GetTxManager(),
 		deps.GetLocator(),
 		deps.GetConnsPool(),
-		deps.GetGit2goExecutor(),
 		deps.GetGitCmdFactory(),
 		deps.GetCatfileCache(),
 		deps.GetUpdaterWithHooks(),
@@ -98,7 +97,6 @@ func RegisterAll(srv *grpc.Server, deps *service.Dependencies) {
 		deps.GetGitCmdFactory(),
 		deps.GetCatfileCache(),
 		deps.GetConnsPool(),
-		deps.GetGit2goExecutor(),
 		deps.GetHousekeepingManager(),
 		deps.GetBackupSink(),
 		deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/smarthttp/testhelper_test.go b/internal/gitaly/service/smarthttp/testhelper_test.go
index 451043ea5..e765b020e 100644
--- a/internal/gitaly/service/smarthttp/testhelper_test.go
+++ b/internal/gitaly/service/smarthttp/testhelper_test.go
@@ -40,7 +40,6 @@ func startSmartHTTPServerWithOptions(t *testing.T, cfg config.Cfg, opts []Server
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/gitaly/service/ssh/testhelper_test.go b/internal/gitaly/service/ssh/testhelper_test.go
index a1620b6f3..0d93a5e9f 100644
--- a/internal/gitaly/service/ssh/testhelper_test.go
+++ b/internal/gitaly/service/ssh/testhelper_test.go
@@ -49,7 +49,6 @@ func startSSHServerWithOptions(t *testing.T, cfg config.Cfg, opts []ServerOpt, s
 			deps.GetGitCmdFactory(),
 			deps.GetCatfileCache(),
 			deps.GetConnsPool(),
-			deps.GetGit2goExecutor(),
 			deps.GetHousekeepingManager(),
 			deps.GetBackupSink(),
 			deps.GetBackupLocator(),
diff --git a/internal/praefect/info_service_test.go b/internal/praefect/info_service_test.go
index d07ede6aa..bb2d2395e 100644
--- a/internal/praefect/info_service_test.go
+++ b/internal/praefect/info_service_test.go
@@ -44,7 +44,6 @@ func TestInfoService_RepositoryReplicas(t *testing.T) {
 				deps.GetGitCmdFactory(),
 				deps.GetCatfileCache(),
 				deps.GetConnsPool(),
-				deps.GetGit2goExecutor(),
 				deps.GetHousekeepingManager(),
 				deps.GetBackupSink(),
 				deps.GetBackupLocator(),
diff --git a/internal/praefect/verifier_test.go b/internal/praefect/verifier_test.go
index b7319df48..a489a1e4a 100644
--- a/internal/praefect/verifier_test.go
+++ b/internal/praefect/verifier_test.go
@@ -484,7 +484,6 @@ func TestVerifier(t *testing.T) {
 							deps.GetGitCmdFactory(),
 							deps.GetCatfileCache(),
 							deps.GetConnsPool(),
-							deps.GetGit2goExecutor(),
 							deps.GetHousekeepingManager(),
 							deps.GetBackupSink(),
 							deps.GetBackupLocator(),
diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go
index 6baae7859..8cc44245c 100644
--- a/internal/testhelper/testserver/gitaly.go
+++ b/internal/testhelper/testserver/gitaly.go
@@ -18,7 +18,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/housekeeping"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo"
-	"gitlab.com/gitlab-org/gitaly/v16/internal/git2go"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config/auth"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/hook"
@@ -268,7 +267,6 @@ type gitalyServerDeps struct {
 	packObjectsLimiter  limiter.Limiter
 	limitHandler        *limithandler.LimiterMiddleware
 	repositoryCounter   *counter.RepositoryCounter
-	git2goExecutor      *git2go.Executor
 	updaterWithHooks    *updateref.UpdaterWithHooks
 	housekeepingManager housekeeping.Manager
 	backupSink          backup.Sink
@@ -343,10 +341,6 @@ func (gsd *gitalyServerDeps) createDependencies(tb testing.TB, cfg config.Cfg) *
 		gsd.repositoryCounter = counter.NewRepositoryCounter(cfg.Storages)
 	}
 
-	if gsd.git2goExecutor == nil {
-		gsd.git2goExecutor = git2go.NewExecutor(cfg, gsd.gitCmdFactory, gsd.locator, gsd.logger)
-	}
-
 	if gsd.updaterWithHooks == nil {
 		gsd.updaterWithHooks = updateref.NewUpdaterWithHooks(cfg, gsd.locator, gsd.hookMgr, gsd.gitCmdFactory, gsd.catfileCache)
 	}
@@ -388,7 +382,6 @@ func (gsd *gitalyServerDeps) createDependencies(tb testing.TB, cfg config.Cfg) *
 		PackObjectsLimiter:  gsd.packObjectsLimiter,
 		LimitHandler:        gsd.limitHandler,
 		RepositoryCounter:   gsd.repositoryCounter,
-		Git2goExecutor:      gsd.git2goExecutor,
 		UpdaterWithHooks:    gsd.updaterWithHooks,
 		HousekeepingManager: gsd.housekeepingManager,
 		PartitionManager:    partitionManager,