Backport #29672 by @charles7668 Close #29661 fix #29656 Co-authored-by: charles <30816317+charles7668@users.noreply.github.com>tags/v1.21.8
@@ -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 |