diff options
| author | John Cai <jcai@gitlab.com> | 2019-09-19 23:46:14 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-09-19 23:46:14 +0300 |
| commit | 0e27aea8a52d81b962ad245345f79a4c967d2882 (patch) | |
| tree | 2d41b1ff50d87cc855eda482687717f87fa07931 | |
| parent | f8bffbfc3c243c83c4080176e1b7729cf9fc4274 (diff) | |
| parent | d4083c6b1c27284e78fa0f35e969597c1fc5a2bf (diff) | |
Merge branch 'zj-repo-config-safe-dsl' into 'master'
DeleteConfig: use git.SafeCmd
Closes #1987
See merge request gitlab-org/gitaly!1500
| -rw-r--r-- | internal/service/repository/config.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/internal/service/repository/config.go b/internal/service/repository/config.go index e9f411f68..551eb7ae9 100644 --- a/internal/service/repository/config.go +++ b/internal/service/repository/config.go @@ -14,7 +14,10 @@ import ( func (*server) DeleteConfig(ctx context.Context, req *gitalypb.DeleteConfigRequest) (*gitalypb.DeleteConfigResponse, error) { for _, k := range req.Keys { // We assume k does not contain any secrets; it is leaked via 'ps'. - cmd, err := git.Command(ctx, req.Repository, "config", "--unset-all", k) + cmd, err := git.SafeCmd(ctx, req.Repository, nil, git.SubCmd{ + Name: "config", + Flags: []git.Option{git.ValueFlag{"--unset-all", k}}, + }) if err != nil { return nil, err } |