diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-17 22:17:42 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-17 22:17:42 +0300 |
| commit | 66ae0c68f3667bfeddd57e5b635742cf55c13929 (patch) | |
| tree | b0d6f2d295e24be9b7d24223bf73350c05357951 | |
| parent | f74214a0db3657e560db95adc700a065b9a53363 (diff) | |
| parent | b01bb5344677d379258a3e1b91eedfad56ff049c (diff) | |
Merge branch 'zj-git-dsl-objectpool' into 'master'
Git DSL for objectpool alternates and reduplicate
Closes #1963 and #1965
See merge request gitlab-org/gitaly!1556
| -rw-r--r-- | internal/service/objectpool/alternates.go | 5 | ||||
| -rw-r--r-- | internal/service/objectpool/reduplicate.go | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/internal/service/objectpool/alternates.go b/internal/service/objectpool/alternates.go index 4ca132204..db0206ec8 100644 --- a/internal/service/objectpool/alternates.go +++ b/internal/service/objectpool/alternates.go @@ -200,7 +200,10 @@ func removeAlternatesIfOk(ctx context.Context, repo *gitalypb.Repository, altFil } }() - cmd, err := git.Command(ctx, repo, "fsck", "--connectivity-only") + cmd, err := git.SafeCmd(ctx, repo, nil, git.SubCmd{ + Name: "fsck", + Flags: []git.Option{git.Flag{"--connectivity-only"}}, + }) if err != nil { return err } diff --git a/internal/service/objectpool/reduplicate.go b/internal/service/objectpool/reduplicate.go index eb4f5c834..d1a2f2267 100644 --- a/internal/service/objectpool/reduplicate.go +++ b/internal/service/objectpool/reduplicate.go @@ -14,7 +14,10 @@ func (s *server) ReduplicateRepository(ctx context.Context, req *gitalypb.Redupl return nil, status.Errorf(codes.InvalidArgument, "ReduplicateRepository: no repository") } - cmd, err := git.Command(ctx, req.GetRepository(), "repack", "--quiet", "-a") + cmd, err := git.SafeCmd(ctx, req.GetRepository(), nil, git.SubCmd{ + Name: "repack", + Flags: []git.Option{git.Flag{"--quiet"}, git.Flag{"-a"}}, + }) if err != nil { return nil, err } |