Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-09-18 14:58:15 +02:00
Code Issues Activity

fix status check in MergeRequiredContextsCommitStatus

Browse Source
This commit is contained in:
wxiaoguang
2025-05-28 04:11:17 +08:00
parent e6dc1862ec
commit ebeed31671
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pull/commit_status.go
+5
View File
@@ -61,6 +61,11 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {
status := git_model.CalcCommitStatus(commitStatuses)
if status != nil {
// FIXME: this check is not right, "status" can never be nil, but its fields can be empty if commitStatuses is empty
// here is just a quick patch to make it overall right.
if status.State == "" || status.State == structs.CommitStatusSkipped {
return structs.CommitStatusSuccess
}
return status.State
}
return structs.CommitStatusSuccess