nune/gitea
nune/gitea
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Backport #30877
This commit is contained in:
wxiaoguang 2024-05-07 10:07:33 +08:00 • committed by GitHub
parent ad5a8d043c
commit d5563be0ee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 116 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

2
services/repository/files/patch.go
View file

@ -148,7 +148,7 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
stderr := &strings.Builder{}
cmdApply := git.NewCommand(ctx, "apply", "--index", "--recount", "--cached", "--ignore-whitespace", "--whitespace=fix", "--binary")
if git.CheckGitVersionAtLeast("2.32") == nil {
if git.DefaultFeatures().CheckVersionAtLeast("2.32") {
cmdApply.AddArguments("-3")
}