File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -1243,7 +1243,11 @@ func MergePullRequest(ctx *context.Context) {
12431243func 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 {
You can’t perform that action at this time.
0 commit comments