Skip to content

Commit ea2f87d

Browse files
committed
fix err msg
1 parent 71b5edd commit ea2f87d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

services/pull/check.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ func CheckPullMergeable(stdCtx context.Context, doer *user_model.User, perm *acc
122122
if adminForceMerge {
123123
isRepoAdmin, errForceMerge := access_model.IsUserRepoAdmin(ctx, pr.BaseRepo, doer)
124124
if errForceMerge != nil {
125-
return fmt.Errorf("IsUserRepoAdmin failed, repo: %-v, doer: %-v, err: %w", pr.BaseRepo, doer, errForceMerge)
125+
return fmt.Errorf("IsUserRepoAdmin failed, repo: %v, doer: %v, err: %w", pr.BaseRepoID, doer.ID, errForceMerge)
126126
}
127127

128128
protectedBranchRule, errForceMerge := git_model.GetFirstMatchProtectedBranchRule(ctx, pr.BaseRepoID, pr.BaseBranch)
129129
if errForceMerge != nil {
130-
return fmt.Errorf("GetFirstMatchProtectedBranchRule failed: repo: %-v, base branch: %v, err: %w", pr.BaseRepo, pr.BaseBranch, errForceMerge)
130+
return fmt.Errorf("GetFirstMatchProtectedBranchRule failed, repo: %v, base branch: %v, err: %w", pr.BaseRepoID, pr.BaseBranch, errForceMerge)
131131
}
132132

133133
// if doer is admin and the "Force Merge" is not blocked, then clear the branch protection check error

0 commit comments

Comments
 (0)