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 @@ -1208,7 +1208,11 @@ func MergePullRequest(ctx *context.Context) {
12081208func 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 {
You can’t perform that action at this time.
0 commit comments