diff options
author | John Cai <jcai@gitlab.com> | 2019-09-19 00:56:37 +0300 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2019-09-19 01:03:24 +0300 |
commit | 630c801403e7c7476686b390b9321a940454a1af (patch) | |
tree | 744a8ddaceb6ef4e7616949270cbe3bc1f70f093 | |
parent | d2dc9d4b87c5e0d3416a78b3d47321078e5f93f9 (diff) |
Use safe command in HasLocalBranches
-rw-r--r-- | changelogs/unreleased/jc-safe-cmd-on-repository.yml | 5 | ||||
-rw-r--r-- | internal/service/repository/repository.go | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/changelogs/unreleased/jc-safe-cmd-on-repository.yml b/changelogs/unreleased/jc-safe-cmd-on-repository.yml new file mode 100644 index 000000000..e7ea4356e --- /dev/null +++ b/changelogs/unreleased/jc-safe-cmd-on-repository.yml @@ -0,0 +1,5 @@ +--- +title: Use safe command in HasLocalBranches +merge_request: 1499 +author: +type: other diff --git a/internal/service/repository/repository.go b/internal/service/repository/repository.go index 1e1f71c40..e0282e994 100644 --- a/internal/service/repository/repository.go +++ b/internal/service/repository/repository.go @@ -26,8 +26,7 @@ func (s *server) RepositoryExists(ctx context.Context, in *gitalypb.RepositoryEx } func (s *server) HasLocalBranches(ctx context.Context, in *gitalypb.HasLocalBranchesRequest) (*gitalypb.HasLocalBranchesResponse, error) { - args := []string{"for-each-ref", "--count=1", "refs/heads"} - cmd, err := git.Command(ctx, in.GetRepository(), args...) + cmd, err := git.SafeCmd(ctx, in.GetRepository(), nil, git.SubCmd{Name: "for-each-ref", Flags: []git.Option{git.Flag{Name: "--count=1"}}, Args: []string{"refs/heads"}}) if err != nil { if _, ok := status.FromError(err); ok { return nil, err |