Skip to content

Commit 15f3e9d

Browse files
GiteaBotwxiaoguang
andauthored
Don't show unnecessary error message to end users for DeleteBranchAfterMerge (#35937) (#35941)
Backport #35937 by wxiaoguang Co-authored-by: wxiaoguang <[email protected]>
1 parent 01fa8b2 commit 15f3e9d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

routers/web/repo/pull.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,11 @@ func MergePullRequest(ctx *context.Context) {
12081208
func deleteBranchAfterMergeAndFlashMessage(ctx *context.Context, prID int64) {
12091209
var fullBranchName string
12101210
err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, prID, &fullBranchName)
1211-
if errTr := util.ErrorAsTranslatable(err); errTr != nil {
1211+
if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) {
1212+
// no need to show error to end users if no permission or branch not exist
1213+
log.Debug("DeleteBranchAfterMerge (ignore unnecessary error): %v", err)
1214+
return
1215+
} else if errTr := util.ErrorAsTranslatable(err); errTr != nil {
12121216
ctx.Flash.Error(errTr.Translate(ctx.Locale))
12131217
return
12141218
} else if err == nil {

0 commit comments

Comments
 (0)