fix

wxiaoguang · wxiaoguang · commit f5dc6f4f53c3 · 2025-11-12T22:07:54.000+08:00
diff --git 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
 }

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,8 @@ func DeleteBranchAfterMerge(ctx context.Context, doer *user_model.User, prID int`
`823`	`823`
`824`	`824`	`err = DeleteBranch(ctx, doer, pr.HeadRepo, gitHeadRepo, pr.HeadBranch, pr)`
`825`	`825`	`if errors.Is(err, util.ErrPermissionDenied) \|\| errors.Is(err, util.ErrNotExist) {`
`826`		`- return errFailedToDelete(err)`
	`826`	`+ log.Debug("DeleteBranch: %v", err)`
	`827`	`+ return nil // no need to show error to end users if no permission or branch not exist`
`827`	`828`	`}`
`828`	`829`	`return err`
`829`	`830`	`}`