diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-07 21:24:32 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-07 21:24:32 +0300 |
| commit | cd55801fe87cb6cf416c5439f85f29570d330519 (patch) | |
| tree | dcee1f36108e4043204a8df4eefc62dbcea7fd09 | |
| parent | a5ca2426be195b74bf9cb8d9cccd2ca7681931cd (diff) | |
| parent | 7c545e12fc7a23c300cf5f3b4c5800fbf2d53d4e (diff) | |
Merge branch 'zj-numstat-safe-dsl' into 'master'
Use git.SafeCmd for numstats of diffs
Closes #1961
See merge request gitlab-org/gitaly!1538
| -rw-r--r-- | internal/service/diff/numstat.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/service/diff/numstat.go b/internal/service/diff/numstat.go index 38f7de5a7..d843090b3 100644 --- a/internal/service/diff/numstat.go +++ b/internal/service/diff/numstat.go @@ -21,8 +21,11 @@ func (s *server) DiffStats(in *gitalypb.DiffStatsRequest, stream gitalypb.DiffSe } var batch []*gitalypb.DiffStats - cmdArgs := []string{"diff", "--numstat", "-z", in.LeftCommitId, in.RightCommitId} - cmd, err := git.Command(stream.Context(), in.Repository, cmdArgs...) + cmd, err := git.SafeCmd(stream.Context(), in.Repository, nil, git.SubCmd{ + Name: "diff", + Flags: []git.Option{git.Flag{"--numstat"}, git.Flag{"-z"}}, + Args: []string{in.LeftCommitId, in.RightCommitId}, + }) if err != nil { if _, ok := status.FromError(err); ok { |