Fix errors.Is

lunny · lunny · commit 378949131e8e · 2024-10-01T22:20:29.000-07:00
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
@@ -288,7 +288,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 	perm := access_model.Permission{AccessMode: perm.AccessModeWrite}
 
 	if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {
-		if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) {
+		if errors.Is(err, pull_service.ErrUserNotAllowedToMerge) {
 			log.Info("%-v was scheduled to automerge by an unauthorized user", pr)
 			return
 		}

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {`
`288`	`288`	`perm := access_model.Permission{AccessMode: perm.AccessModeWrite}`
`289`	`289`
`290`	`290`	`if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil {`
`291`		`- if errors.Is(pull_service.ErrUserNotAllowedToMerge, err) {`
	`291`	`+ if errors.Is(err, pull_service.ErrUserNotAllowedToMerge) {`
`292`	`292`	`log.Info("%-v was scheduled to automerge by an unauthorized user", pr)`
`293`	`293`	`return`
`294`	`294`	`}`