Fix commit_status problem when testing (#29672)

charles7668 · GiteaBot · web-flow · commit 0c273f12e0b5 · 2024-03-08T16:43:48.000+01:00
Close #29661 fix #29656 Co-authored-by: Giteabot <teabot@gitea.io>
diff --git a/services/pull/commit_status.go b/services/pull/commit_status.go
@@ -59,7 +59,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
`@@ -59,7 +59,7 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`		`- if matchedCount == 0 {`
	`62`	`+ if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {`
`63`	`63`	`status := git_model.CalcCommitStatus(commitStatuses)`
`64`	`64`	`if status != nil {`
`65`	`65`	`return status.State`