Fix merge bug

lunny · lunny · commit be5a5ea627b2 · 2024-12-30T12:15:39.000-08:00
diff --git a/services/pull/pull.go b/services/pull/pull.go
@@ -742,7 +742,7 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User
 			errs = append(errs, err)
 		}
 		if err == nil {
-			if err = issue_service.ChangeStatus(ctx, pr.Issue, doer, "", true); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {
+			if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {
 				errs = append(errs, err)
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ func AdjustPullsCausedByBranchDeleted(ctx context.Context, doer *user_model.User`
`742`	`742`	`errs = append(errs, err)`
`743`	`743`	`}`
`744`	`744`	`if err == nil {`
`745`		`- if err = issue_service.ChangeStatus(ctx, pr.Issue, doer, "", true); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {`
	`745`	`+ if err = issue_service.CloseIssue(ctx, pr.Issue, doer, ""); err != nil && !issues_model.IsErrPullWasClosed(err) && !issues_model.IsErrDependenciesLeft(err) {`
`746`	`746`	`errs = append(errs, err)`
`747`	`747`	`}`
`748`	`748`	`}`