Skip to content

Don't show unnecessary error message to end users for DeleteBranchAfterMerge #35937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wxiaoguang merged 3 commits into from
Nov 12, 2025
Merged

Don't show unnecessary error message to end users for DeleteBranchAfterMerge #35937

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5dc6f4
fix
wxiaoguang Nov 12, 2025
75d7f14
fine tune
wxiaoguang Nov 12, 2025
a079aaa
fine tune
wxiaoguang Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion services/repository/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}