don't return error even retargetbranch of pull request failed

lunny · lunny · commit 6c08cc5bcb45 · 2024-11-10T12:03:16.000-08:00
diff --git a/services/repository/push.go b/services/repository/push.go
@@ -278,7 +278,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
 
 				if setting.Repository.PullRequest.RetargetChildrenOnMerge {
 					if err := pull_service.RetargetBranchPulls(ctx, pusher, repo.ID, branch, repo.DefaultBranch); err != nil {
-						return err
+						log.Error("retargetBranchPulls failed: %v", err)
 					}
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {`
`278`	`278`
`279`	`279`	`if setting.Repository.PullRequest.RetargetChildrenOnMerge {`
`280`	`280`	`if err := pull_service.RetargetBranchPulls(ctx, pusher, repo.ID, branch, repo.DefaultBranch); err != nil {`
`281`		`- return err`
	`281`	`+ log.Error("retargetBranchPulls failed: %v", err)`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`