diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-29 11:14:40 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-10-29 11:14:40 +0300 |
| commit | a193b76fa6cbf33108c6a5ed36a99cc5fdc215c3 (patch) | |
| tree | ecb75b462c259c3d219787ec2fd21079c381b022 | |
| parent | 8f33970836697adb316f64d02d27e70fa142e32f (diff) | |
| parent | 9f4351ef7aa19fc8a7f80bd4f681b6bcbcf58a92 (diff) | |
Merge branch 'cleanup_fetch_internal_remote' into 'master'
Use SafeCmdWithEnv in FetchInternalRemote
See merge request gitlab-org/gitaly!2712
| -rw-r--r-- | internal/gitaly/service/remote/fetch_internal_remote.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/internal/gitaly/service/remote/fetch_internal_remote.go b/internal/gitaly/service/remote/fetch_internal_remote.go index 1cc272144..eba82e680 100644 --- a/internal/gitaly/service/remote/fetch_internal_remote.go +++ b/internal/gitaly/service/remote/fetch_internal_remote.go @@ -32,13 +32,7 @@ func (s *server) FetchInternalRemote(ctx context.Context, req *gitalypb.FetchInt return nil, err } - repoPath, err := s.locator.GetRepoPath(req.Repository) - if err != nil { - return nil, err - } - - cmd, err := git.SafeBareCmd(ctx, git.CmdStream{}, env, - []git.Option{git.ValueFlag{"--git-dir", repoPath}}, + cmd, err := git.SafeCmdWithEnv(ctx, env, req.Repository, nil, git.SubCmd{ Name: "fetch", Flags: []git.Option{git.Flag{Name: "--prune"}}, |