summaryrefslogtreecommitdiffstats
path: root/services/pull
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 /services/pull
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 'services/pull')
-rw-r--r--services/pull/merge.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go
index fcced65cdf..76798d73ed 100644
--- a/services/pull/merge.go
+++ b/services/pull/merge.go
@@ -223,12 +223,6 @@ func Merge(ctx context.Context, pr *models.PullRequest, doer *user_model.User, b
// rawMerge perform the merge operation without changing any pull information in database
func rawMerge(ctx context.Context, pr *models.PullRequest, doer *user_model.User, mergeStyle repo_model.MergeStyle, expectedHeadCommitID, message string) (string, error) {
- err := git.LoadGitVersion()
- if err != nil {
- log.Error("git.LoadGitVersion: %v", err)
- return "", fmt.Errorf("Unable to get git version: %v", err)
- }
-
// Clone base repo.
tmpBasePath, err := createTemporaryRepo(ctx, pr)
if err != nil {