public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-02-07 09:49:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Always honor user's choice for "delete branch after merge" (#36281)

Browse Source 
Fix #36280
This commit is contained in:
wxiaoguang
2026-01-03 10:36:21 +08:00
committed by GitHub
parent d2baa8103f
commit 6fb3547417
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
routers/web/repo/pull.go
View File

@@ -32,6 +32,7 @@ import (
"code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/graceful"
issue_template "code.gitea.io/gitea/modules/issue/template" issue_template "code.gitea.io/gitea/modules/issue/template"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/optional"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/templates" "code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/util"
@@ -1136,11 +1137,9 @@ func MergePullRequest(ctx *context.Context) {
message += "\n\n" + form.MergeMessageField message += "\n\n" + form.MergeMessageField
} }
deleteBranchAfterMerge, err := pull_service.ShouldDeleteBranchAfterMerge(ctx, form.DeleteBranchAfterMerge, ctx.Repo.Repository, pr) // There is always a checkbox on the UI (the DeleteBranchAfterMerge is nil if the checkbox is not checked),
if err != nil { // just use the user's choice, don't use pull_service.ShouldDeleteBranchAfterMerge to decide
ctx.ServerError("ShouldDeleteBranchAfterMerge", err) deleteBranchAfterMerge := optional.FromPtr(form.DeleteBranchAfterMerge).Value()
return
}
if form.MergeWhenChecksSucceed { if form.MergeWhenChecksSucceed {
// delete all scheduled auto merges // delete all scheduled auto merges