tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

refactor delete head branch of pull request

Browse Source
This commit is contained in:
Lunny Xiao
2024-11-08 18:30:42 -08:00
parent 6d79d8ac4c
commit 75623936e9
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/automerge/automerge.go
+2 -11
View File
@@ -15,7 +15,6 @@ import (
access_model "code.gitea.io/gitea/models/perm/access"
pull_model "code.gitea.io/gitea/models/pull"
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/gitrepo"
@@ -307,16 +306,8 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
}
if pr.Flow == issues_model.PullRequestFlowGithub && scheduledPRM.DeleteBranchAfterMerge {
perm, err := access_model.GetUserRepoPermission(ctx, pr.HeadRepo, doer)
if err != nil {
log.Error("GetUserRepoPermission %-v: %v", pr.HeadRepo, err)
return
}
if perm.CanWrite(unit.TypeCode) { // default branch and branch protection will be checked in DeleteBranch
if err := repo_service.DeleteBranch(ctx, doer, pr.HeadRepo, headGitRepo, pr.HeadBranch); err != nil {
log.Error("deleteBranch after automerge for pull[%d] failed: %v", pr.ID, err)
}
if err := repo_service.DeletePullRequestHeadBranch(ctx, pr, doer, headGitRepo); err != nil {
log.Error("DeletePullRequestHeadBranch: %v", err)
}
}
}