From 857a1553dae65cf84b813c3b2362530d4b237769 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Nov 2025 07:03:13 +0800 Subject: [PATCH] Don't show unnecessary error message to end users for DeleteBranchAfterMerge (#35937) --- routers/web/repo/pull.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index edccdef8b134c..a9dd95f2d4a62 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -1208,7 +1208,11 @@ func MergePullRequest(ctx *context.Context) { func deleteBranchAfterMergeAndFlashMessage(ctx *context.Context, prID int64) { var fullBranchName string err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, prID, &fullBranchName) - if errTr := util.ErrorAsTranslatable(err); errTr != nil { + if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) { + // no need to show error to end users if no permission or branch not exist + log.Debug("DeleteBranchAfterMerge (ignore unnecessary error): %v", err) + return + } else if errTr := util.ErrorAsTranslatable(err); errTr != nil { ctx.Flash.Error(errTr.Translate(ctx.Locale)) return } else if err == nil {