Merge branch 'jv-1990' into 'master'

Fsck: use git.SafeBareCmd

Closes #1990

See merge request gitlab-org/gitaly!1505

1 files changed, 4 insertions, 3 deletions

diff --git a/internal/service/repository/fsck.go b/internal/service/repository/fsck.go
index 0d29440de..d775c9dbf 100644
--- a/internal/service/repository/fsck.go
+++ b/internal/service/repository/fsck.go
@@ -17,9 +17,10 @@ func (s *server) Fsck(ctx context.Context, req *gitalypb.FsckRequest) (*gitalypb
 		return nil, err
 	}
 
-	args := []string{"--git-dir", repoPath, "fsck"}
-
-	cmd, err := git.BareCommand(ctx, nil, &stdout, &stderr, env, args...)
+	cmd, err := git.SafeBareCmd(ctx, nil, &stdout, &stderr, env,
+		[]git.Option{git.ValueFlag{"--git-dir", repoPath}},
+		git.SubCmd{Name: "fsck"},
+	)
 	if err != nil {
 		return nil, err
 	}