Skip to content

Commit b95fd7e

Browse files
authored
Don't show unnecessary error message to end users for DeleteBranchAfterMerge (#35937)
1 parent 372d24b commit b95fd7e

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
@@ -1243,7 +1243,11 @@ func MergePullRequest(ctx *context.Context) {
12431243
func deleteBranchAfterMergeAndFlashMessage(ctx *context.Context, prID int64) {
12441244
var fullBranchName string
12451245
err := repo_service.DeleteBranchAfterMerge(ctx, ctx.Doer, prID, &fullBranchName)
1246-
if errTr := util.ErrorAsTranslatable(err); errTr != nil {
1246+
if errors.Is(err, util.ErrPermissionDenied) || errors.Is(err, util.ErrNotExist) {
1247+
// no need to show error to end users if no permission or branch not exist
1248+
log.Debug("DeleteBranchAfterMerge (ignore unnecessary error): %v", err)
1249+
return
1250+
} else if errTr := util.ErrorAsTranslatable(err); errTr != nil {
12471251
ctx.Flash.Error(errTr.Translate(ctx.Locale))
12481252
return
12491253
} else if err == nil {

0 commit comments

Comments
 (0)