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-11-12 20:10:26 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2019-11-12 20:10:26 +0300
commitc8942e35aef1da6a96116489e1dbb4d0384e1f04 (patch)
treef1b68e2cb2c779c34272dcaa4b23a3097b383ff8
parent40e5390949efa777cedf051cf943a836049f6ba2 (diff)
parent98591d2b2204b1dab3319cb0fb71ec0f497e55d0 (diff)
Merge branch 'stats-git-dsl' into 'master'
Apply GitDSL for stats.go Closes #1959 See merge request gitlab-org/gitaly!1613
-rw-r--r--internal/service/commit/stats.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/internal/service/commit/stats.go b/internal/service/commit/stats.go
index dad833bfb..8f2fc29f7 100644
--- a/internal/service/commit/stats.go
+++ b/internal/service/commit/stats.go
@@ -35,7 +35,7 @@ func commitStats(ctx context.Context, in *gitalypb.CommitStatsRequest) (*gitalyp
return nil, fmt.Errorf("commit not found: %q", in.Revision)
}
- args := []string{"diff", "--numstat"}
+ var args []string
if len(commit.GetParentIds()) == 0 {
args = append(args, git.EmptyTreeID, commit.Id)
@@ -43,7 +43,11 @@ func commitStats(ctx context.Context, in *gitalypb.CommitStatsRequest) (*gitalyp
args = append(args, commit.Id+"^", commit.Id)
}
- cmd, err := git.Command(ctx, in.Repository, args...)
+ cmd, err := git.SafeCmd(ctx, in.Repository, nil, git.SubCmd{
+ Name: "diff",
+ Flags: []git.Option{git.Flag{"--numstat"}},
+ Args: args,
+ })
if err != nil {
return nil, err
}