From f7330fd0273848eada2d509892565189295ac96b Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Mon, 2 May 2022 01:54:20 +0200 Subject: [PATCH] Dont overwrite err with nil (part #19572) (#19574) * Dont overwrite err with nil (part #19572) Co-authored-by: Gusted --- services/pull/check.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/pull/check.go b/services/pull/check.go index d9af056ea1..93e539e587 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -32,8 +32,8 @@ import ( var prQueue queue.UniqueQueue var ( - ErrIsClosed = errors.New("pull is cosed") - ErrUserNotAllowedToMerge = errors.New("user not allowed to merge") + ErrIsClosed = errors.New("pull is closed") + ErrUserNotAllowedToMerge = models.ErrNotAllowedToMerge{} ErrHasMerged = errors.New("has already been merged") ErrIsWorkInProgress = errors.New("work in progress PRs cannot be merged") ErrIsChecking = errors.New("cannot merge while conflict checking is in progress") @@ -96,10 +96,10 @@ func CheckPullMergable(ctx context.Context, doer *user_model.User, perm *models. if err := CheckPRReadyToMerge(pr, false); err != nil { if models.IsErrNotAllowedToMerge(err) { if force { - if isRepoAdmin, err := models.IsUserRepoAdmin(pr.BaseRepo, doer); err != nil { - return err + if isRepoAdmin, err2 := models.IsUserRepoAdmin(pr.BaseRepo, doer); err2 != nil { + return err2 } else if !isRepoAdmin { - return ErrUserNotAllowedToMerge + return err } } } else { -- 2.39.5