diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2019-11-12 22:55:29 +0300 |
---|---|---|
committer | Paul Okstad <pokstad@gitlab.com> | 2019-11-12 22:55:29 +0300 |
commit | 6937fbcbb90f94d87bb0e2063c6540bc10d1db37 (patch) | |
tree | f4492fce897a18b06f1c7e798a236801e0bbbbb6 | |
parent | e62c4209766156272e0771afd629c54d29700929 (diff) |
Use Git DSL in SSHUploadPack
-rw-r--r-- | internal/service/ssh/upload_pack.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/internal/service/ssh/upload_pack.go b/internal/service/ssh/upload_pack.go index b4881a618..180dd0221 100644 --- a/internal/service/ssh/upload_pack.go +++ b/internal/service/ssh/upload_pack.go @@ -50,16 +50,15 @@ func sshUploadPack(stream gitalypb.SSHService_SSHUploadPackServer, req *gitalypb git.WarnIfTooManyBitmaps(ctx, repoPath) - args := []string{} - - for _, params := range req.GitConfigOptions { - args = append(args, "-c", params) + var globalOpts []git.Option + for _, o := range req.GitConfigOptions { + globalOpts = append(globalOpts, git.ValueFlag{"-c", o}) } - args = append(args, "upload-pack", repoPath) - - cmd, err := git.BareCommand(ctx, stdin, stdout, stderr, env, args...) - + cmd, err := git.SafeBareCmd(ctx, stdin, stdout, stderr, env, globalOpts, git.SubCmd{ + Name: "upload-pack", + Args: []string{repoPath}, + }) if err != nil { return fmt.Errorf("start cmd: %v", err) } |