opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-08-06 18:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make sure git version&feature are always prepared (#30877)

Browse Source 
Otherwise there would be more similar issues like #29287
This commit is contained in:
wxiaoguang
2024-05-07 00:34:16 +08:00
committed by GitHub
parent 8e8ca6c653
commit 7c613f100e
28 changed files with 116 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/pull/patch.go
View File

@ -383,7 +383,7 @@ func checkConflicts(ctx context.Context, pr *issues_model.PullRequest, gitRepo *
cmdApply.AddArguments("--ignore-whitespace")
}
is3way := false
if git.CheckGitVersionAtLeast("2.32.0") == nil {
if git.DefaultFeatures().CheckVersionAtLeast("2.32.0") {
cmdApply.AddArguments("--3way")
is3way = true
}