From f5dc6f4f53c3f6b40ed9c923b8c9cd22cd26b3af Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 12 Nov 2025 22:07:54 +0800 Subject: [PATCH 1/3] fix --- services/repository/branch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/repository/branch.go b/services/repository/branch.go index 0a2fd30620d22..baacd46fba02e 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -823,7 +823,8 @@ func DeleteBranchAfterMerge(ctx context.Context, doer *user_model.User, prID int err = DeleteBranch(ctx, doer, pr.HeadRepo, gitHeadRepo, pr.HeadBranch, pr) if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) { - return errFailedToDelete(err) + log.Debug("DeleteBranch: %v", err) + return nil // no need to show error to end users if no permission or branch not exist } return err } From 75d7f14399314bcee66d8f148e8479154f515e09 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Nov 2025 01:35:56 +0800 Subject: [PATCH 2/3] fine tune --- routers/web/repo/pull.go | 6 +++++- services/repository/branch.go | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 17e3bf2b78176..6b36b0668085b 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -1243,7 +1243,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("DeleteBranch: %v", err) + return + } else if errTr := util.ErrorAsTranslatable(err); errTr != nil { ctx.Flash.Error(errTr.Translate(ctx.Locale)) return } else if err == nil { diff --git a/services/repository/branch.go b/services/repository/branch.go index baacd46fba02e..0a2fd30620d22 100644 --- a/services/repository/branch.go +++ b/services/repository/branch.go @@ -823,8 +823,7 @@ func DeleteBranchAfterMerge(ctx context.Context, doer *user_model.User, prID int err = DeleteBranch(ctx, doer, pr.HeadRepo, gitHeadRepo, pr.HeadBranch, pr) if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) { - log.Debug("DeleteBranch: %v", err) - return nil // no need to show error to end users if no permission or branch not exist + return errFailedToDelete(err) } return err } From a079aaa864ddf6eabdb0e6b2f90391775adbb046 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 13 Nov 2025 01:37:38 +0800 Subject: [PATCH 3/3] fine tune --- routers/web/repo/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 6b36b0668085b..4353e00840f92 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -1245,7 +1245,7 @@ func deleteBranchAfterMergeAndFlashMessage(ctx *context.Context, prID int64) { err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, prID, &fullBranchName) 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("DeleteBranch: %v", err) + log.Debug("DeleteBranchAfterMerge (ignore unnecessary error): %v", err) return } else if errTr := util.ErrorAsTranslatable(err); errTr != nil { ctx.Flash.Error(errTr.Translate(ctx.Locale))