Fix commit_status problem when testing (#29672) (#29675)

GiteaBot · charles7668 · web-flow · commit 1f897637441a · 2024-03-08T16:04:23.000Z
Backport #29672 by @charles7668 Close #29661 fix #29656 Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>
diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go
@@ -58,7 +58,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
 		}
 	}
 
-	if matchedCount == 0 {
+	if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {
 		status := git_model.CalcCommitStatus(commitStatuses)
 		if status != nil {
 			return status.State

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`		`- if matchedCount == 0 {`
	`61`	`+ if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {`
`62`	`62`	`status := git_model.CalcCommitStatus(commitStatuses)`
`63`	`63`	`if status != nil {`
`64`	`64`	`return status.State`