Merge branch 'jv-1994' into 'master'

FindMergeBase: use git.SafeCmd

Closes #1994

See merge request gitlab-org/gitaly!1504

1 files changed, 9 insertions, 7 deletions

diff --git a/internal/service/repository/merge_base.go b/internal/service/repository/merge_base.go
index a28da1123..e663085a0 100644
--- a/internal/service/repository/merge_base.go
+++ b/internal/service/repository/merge_base.go
@@ -12,17 +12,19 @@ import (
 )
 
 func (s *server) FindMergeBase(ctx context.Context, req *gitalypb.FindMergeBaseRequest) (*gitalypb.FindMergeBaseResponse, error) {
-	revisions := req.GetRevisions()
-	if len(revisions) < 2 {
-		return nil, status.Errorf(codes.InvalidArgument, "FindMergeBase: at least 2 revisions are required")
+	var revisions []string
+	for _, rev := range req.GetRevisions() {
+		revisions = append(revisions, string(rev))
 	}
 
-	args := []string{"merge-base"}
-	for _, revision := range revisions {
-		args = append(args, string(revision))
+	if len(revisions) < 2 {
+		return nil, status.Errorf(codes.InvalidArgument, "FindMergeBase: at least 2 revisions are required")
 	}
 
-	cmd, err := git.Command(ctx, req.GetRepository(), args...)
+	cmd, err := git.SafeCmd(ctx, req.GetRepository(), nil, git.SubCmd{
+		Name: "merge-base",
+		Args: revisions,
+	})
 	if err != nil {
 		if _, ok := status.FromError(err); ok {
 			return nil, err