summaryrefslogtreecommitdiffstats
path: root/modules/git/repo_language_stats_gogit.go
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2023-05-25 03:37:36 +0800
committerGitHub <noreply@github.com>2023-05-24 19:37:36 +0000
commit395bb33e4c9712e570f597c3ca24a4c3c6acdaff (patch)
tree66a3f0ab0f962ce102fd345cd3dcf2d1b32f5a6c /modules/git/repo_language_stats_gogit.go
parent63d5e762d8813881bd7449ac5c05ae95cc3a93eb (diff)
downloadgitea-395bb33e4c9712e570f597c3ca24a4c3c6acdaff.tar.gz
gitea-395bb33e4c9712e570f597c3ca24a4c3c6acdaff.zip
Merge different languages for language stats (#24900)
Fix #24896 If users set different languages by `linguist-language`, the `stats` map could be: `java: 100, Java: 200`. Language stats are stored as case-insensitive in database and there is a unique key. So, the different language names should be merged to one unique name: `Java: 300`
Diffstat (limited to 'modules/git/repo_language_stats_gogit.go')
-rw-r--r--modules/git/repo_language_stats_gogit.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/git/repo_language_stats_gogit.go b/modules/git/repo_language_stats_gogit.go
index 9674eca275..4c6fbd6c7e 100644
--- a/modules/git/repo_language_stats_gogit.go
+++ b/modules/git/repo_language_stats_gogit.go
@@ -156,7 +156,7 @@ func (repo *Repository) GetLanguageStats(commitID string) (map[string]int64, err
sizes[firstExcludedLanguage] = firstExcludedLanguageSize
}
- return sizes, nil
+ return mergeLanguageStats(sizes), nil
}
func readFile(f *object.File, limit int64) ([]byte, error) {