aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/admin
diff options
context:
space:
mode:
authorwxiaoguang <wxiaoguang@gmail.com>2022-06-10 09:57:49 +0800
committerGitHub <noreply@github.com>2022-06-10 09:57:49 +0800
commita0051634b982608d94399033a8b76e7e3b1537ac (patch)
tree174bf860eb23c80bff16dc0e94f8d7d1a3437f0a /routers/web/admin
parente26f84a9b75f250f951e0efa5c5c62860b3c8370 (diff)
downloadgitea-a0051634b982608d94399033a8b76e7e3b1537ac.tar.gz
gitea-a0051634b982608d94399033a8b76e7e3b1537ac.zip
Refactor git module, make Gitea use internal git config (#19732)
* Refactor git module, make Gitea use internal git config, add safe.directory config * introduce git.InitSimple and git.InitWithConfigSync, make serv cmd use gitconfig * use HOME instead of GIT_CONFIG_GLOBAL, because git always needs a correct HOME * fix cmd env in cmd/serv.go * fine tune error message * Fix a incorrect test case * fix configAddNonExist * fix configAddNonExist logic, add `--fixed-value` flag, add tests * add configSetNonExist function in case it's needed. * use configSetNonExist for `user.name` and `user.email` * add some comments * Update cmd/serv.go Co-authored-by: zeripath <art27@cantab.net> * Update cmd/serv.go Co-authored-by: zeripath <art27@cantab.net> * Update modules/git/git.go Co-authored-by: zeripath <art27@cantab.net> * Update modules/setting/setting.go Co-authored-by: zeripath <art27@cantab.net> * Update modules/git/repo_attribute.go Co-authored-by: zeripath <art27@cantab.net> * fix spaces in messages * use `configSet("core.protectNTFS", ...)` instead of `globalCommandArgs` * remove GIT_CONFIG_NOSYSTEM, continue to use system's git config * Update cmd/serv.go Co-authored-by: zeripath <art27@cantab.net> * fix merge * remove code for safe.directory * separate git.CommonEnvs to CommonGitCmdEnvs and CommonCmdServEnvs * avoid Golang's data race error Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'routers/web/admin')
-rw-r--r--routers/web/admin/admin.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go
index 78347e67c4..24c07b5c1c 100644
--- a/routers/web/admin/admin.go
+++ b/routers/web/admin/admin.go
@@ -247,9 +247,8 @@ func Config(ctx *context.Context) {
ctx.Data["DisableRouterLog"] = setting.DisableRouterLog
ctx.Data["RunUser"] = setting.RunUser
ctx.Data["RunMode"] = util.ToTitleCase(setting.RunMode)
- if version, err := git.LocalVersion(); err == nil {
- ctx.Data["GitVersion"] = version.Original()
- }
+ ctx.Data["GitVersion"] = git.VersionInfo()
+
ctx.Data["RepoRootPath"] = setting.RepoRootPath
ctx.Data["CustomRootPath"] = setting.CustomPath
ctx.Data["StaticRootPath"] = setting.StaticRootPath