Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-06-04 10:16:53 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/git/commit_status.go
View File

@ -237,7 +237,7 @@ func CalcCommitStatus(statuses []*CommitStatus) *CommitStatus {
var lastStatus *CommitStatus var lastStatus *CommitStatus
state := api.CommitStatusSuccess state := api.CommitStatusSuccess
for _, status := range statuses { for _, status := range statuses {
if status.State.HasHigherPriorityThan(state) { if state == status.State || status.State.HasHigherPriorityThan(state) {
state = status.State state = status.State
lastStatus = status lastStatus = status
} }

5
services/pull/commit_status.go
View File

@ -61,6 +61,11 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*git_model.CommitStatus,
if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess { if matchedCount == 0 && returnedStatus == structs.CommitStatusSuccess {
status := git_model.CalcCommitStatus(commitStatuses) status := git_model.CalcCommitStatus(commitStatuses)
if status != nil { 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 status.State
} }
return structs.CommitStatusSuccess return structs.CommitStatusSuccess