Fix merge bug

lunny · lunny · commit 50c2316fecc7 · 2025-01-09T10:43:18.000-08:00
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -722,7 +722,7 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User
 			errs = append(errs, err)
 		}
 		if err == nil {
-			if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {
+			if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrIssueIsClosed(err) && !issues_model.IsErrDependenciesLeft(err) {
 				errs = append(errs, err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,7 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User`
`722`	`722`	`errs = append(errs, err)`
`723`	`723`	`}`
`724`	`724`	`if err == nil {`
`725`		`- if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {`
	`725`	`+ if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrIssueIsClosed(err) && !issues_model.IsErrDependenciesLeft(err) {`
`726`	`726`	`errs = append(errs, err)`
`727`	`727`	`}`
`728`	`728`	`}`