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:
authorJohn Cai <jcai@gitlab.com>2019-11-05 01:34:36 +0300
committerJohn Cai <jcai@gitlab.com>2019-11-05 01:34:36 +0300
commite09620272a033fd290422bc3bf5212c591e05e3c (patch)
tree79a3cad2f27915549219ddb479e333cf96e5aade
parent54e803c183039d19a5a6e0d7e0f730fb74c758e7 (diff)
parent201a64d88f1d0810284424ee0c0bdefabbbf36a2 (diff)
Merge branch 'zj-update-ref-safegit' into 'master'
GitDSL for UpdateRef cmd Closes #1947 See merge request gitlab-org/gitaly!1593
-rw-r--r--internal/git/updateref/updateref.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/internal/git/updateref/updateref.go b/internal/git/updateref/updateref.go
index 7df494b18..573aa8bd1 100644
--- a/internal/git/updateref/updateref.go
+++ b/internal/git/updateref/updateref.go
@@ -24,7 +24,10 @@ type Updater struct {
// It is important that ctx gets canceled somewhere. If it doesn't, the process
// spawned by New() may never terminate.
func New(ctx context.Context, repo repository.GitRepo) (*Updater, error) {
- cmd, err := git.StdinCommand(ctx, repo, "update-ref", "-z", "--stdin")
+ cmd, err := git.SafeStdinCmd(ctx, repo, nil, git.SubCmd{
+ Name: "update-ref",
+ Flags: []git.Option{git.Flag{"-z"}, git.Flag{"--stdin"}},
+ })
if err != nil {
return nil, err
}