Replace CommandWithoutRepo usage with safe version

2 files changed, 26 insertions, 4 deletions

diff --git a/internal/git/objectpool/clone.go b/internal/git/objectpool/clone.go
index f7359e636..45ab2af81 100644
--- a/internal/git/objectpool/clone.go
+++ b/internal/git/objectpool/clone.go
@@ -24,8 +24,23 @@ func (o *ObjectPool) clone(ctx context.Context, repo *gitalypb.Repository) error
 		return err
 	}
 
-	cloneArgs := []string{"-C", path.Dir(targetDir), "clone", "--quiet", "--bare", "--local", repoPath, targetName}
-	cmd, err := git.CommandWithoutRepo(ctx, cloneArgs...)
+	cmd, err := git.SafeCmdWithoutRepo(ctx,
+		[]git.Option{
+			git.ValueFlag{
+				Name:  "-C",
+				Value: path.Dir(targetDir),
+			},
+		},
+		git.SubCmd{
+			Name: "clone",
+			Flags: []git.Option{
+				git.Flag{Name: "--quiet"},
+				git.Flag{Name: "--bare"},
+				git.Flag{Name: "--local"},
+			},
+			Args: []string{repoPath, targetName},
+		},
+	)
 	if err != nil {
 		return err
 	}
diff --git a/internal/git/objectpool/pool.go b/internal/git/objectpool/pool.go
index 5674421ab..ca4628d1b 100644
--- a/internal/git/objectpool/pool.go
+++ b/internal/git/objectpool/pool.go
@@ -108,8 +108,15 @@ func (o *ObjectPool) Init(ctx context.Context) (err error) {
 		return nil
 	}
 
-	initArgs := []string{"init", "--bare", targetDir}
-	cmd, err := git.CommandWithoutRepo(ctx, initArgs...)
+	cmd, err := git.SafeCmdWithoutRepo(ctx, nil,
+		git.SubCmd{
+			Name: "init",
+			Flags: []git.Option{
+				git.Flag{Name: "--bare"},
+			},
+			Args: []string{targetDir},
+		},
+	)
 	if err != nil {
 		return err
 	}