diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-11 00:56:40 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-11 00:56:40 +0300 |
| commit | 3ea6304583bf1441e57a09ba6b7176305b5822f9 (patch) | |
| tree | 9df61f517a5ffdc5103a9fd1351248a5294da449 | |
| parent | 8c25a80577307d3d24358084d039f866574daa87 (diff) | |
| parent | 5f361879b35817bb3b7e5d84b53c04597a07267a (diff) | |
Merge branch 'zj-safecmd-link-objectpool' into 'master'
git.SafeCmd for linking object pools
Closes #1944
See merge request gitlab-org/gitaly!1547
| -rw-r--r-- | internal/git/objectpool/link.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/internal/git/objectpool/link.go b/internal/git/objectpool/link.go index cef02a84e..92edeca99 100644 --- a/internal/git/objectpool/link.go +++ b/internal/git/objectpool/link.go @@ -200,7 +200,10 @@ func (o *ObjectPool) Unlink(ctx context.Context, repo *gitalypb.Repository) erro // this function not suitable for general usage, and scoped to this package. // To be corrected in: https://gitlab.com/gitlab-org/gitaly/issues/1430 func (o *ObjectPool) setConfig(ctx context.Context, key, value string) error { - cmd, err := git.Command(ctx, o, "config", key, value) + cmd, err := git.SafeCmd(ctx, o, nil, git.SubCmd{ + Name: "config", + Flags: []git.Option{git.ConfigPair{Key: key, Value: value}}, + }) if err != nil { return err } |