Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2019-09-20 13:45:13 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-09-20 13:45:13 +0300
commit96f91af301c6dda517abab70e27ce18dd78370c2 (patch)
tree355fa549d9339a60c4024d8ff439e3996d4f7d8a
parent1df8aa6317b82ad89fce7951aecf90e973eb7d59 (diff)
CloneFromPoolInternal: Use Git SafeBareCmd
Closes https://gitlab.com/gitlab-org/gitaly/issues/1986
-rw-r--r--internal/service/repository/clone_from_pool_internal.go15
1 files changed, 5 insertions, 10 deletions
diff --git a/internal/service/repository/clone_from_pool_internal.go b/internal/service/repository/clone_from_pool_internal.go
index e5fa5ddfe..1bf26b5f2 100644
--- a/internal/service/repository/clone_from_pool_internal.go
+++ b/internal/service/repository/clone_from_pool_internal.go
@@ -120,16 +120,11 @@ func cloneFromPool(ctx context.Context, objectPoolRepo *gitalypb.ObjectPool, rep
return fmt.Errorf("could not get object pool path: %v", err)
}
- args := []string{
- "clone",
- "--bare",
- "--shared",
- "--",
- objectPoolPath,
- repositoryPath,
- }
-
- cmd, err := git.BareCommand(ctx, nil, nil, nil, nil, args...)
+ cmd, err := git.SafeBareCmd(ctx, nil, nil, nil, nil, nil, git.SubCmd{
+ Name: "clone",
+ Flags: []git.Option{git.Flag{"--bare"}, git.Flag{"--shared"}},
+ PostSepArgs: []string{objectPoolPath, repositoryPath},
+ })
if err != nil {
return fmt.Errorf("clone with object pool start: %v", err)
}