From 27b8eff96ba84d69d8902fbe62c52878aee5ce89 Mon Sep 17 00:00:00 2001 From: a1012112796 <1012112796@qq.com> Date: Thu, 18 Mar 2021 05:00:26 +0800 Subject: [PATCH] support gitmailmap in GetCodeActivityStats() (#15009) ref: - https://git-scm.com/docs/gitmailmap - https://git-scm.com/docs/git-log#Documentation/git-log.txt-emaNem Signed-off-by: a1012112796 <1012112796@qq.com> Co-authored-by: zeripath --- modules/git/repo_stats.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/git/repo_stats.go b/modules/git/repo_stats.go index 59b817740..cb2a2bcf5 100644 --- a/modules/git/repo_stats.go +++ b/modules/git/repo_stats.go @@ -59,7 +59,7 @@ func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string) _ = stdoutWriter.Close() }() - args := []string{"log", "--numstat", "--no-merges", "--pretty=format:---%n%h%n%an%n%ae%n", "--date=iso", fmt.Sprintf("--since='%s'", since)} + args := []string{"log", "--numstat", "--no-merges", "--pretty=format:---%n%h%n%aN%n%aE%n", "--date=iso", fmt.Sprintf("--since='%s'", since)} if len(branch) == 0 { args = append(args, "--branches=*") } else {