domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Show correct commit status in PR list (#8316)

Browse source 
* Use correct index when fetching commit status

Signed-off-by: Elias Norberg <elias@aisle.se>

* Compare against base repo to avoid mismatch when merging from fork

Signed-off-by: Elias Norberg <elias@aisle.se>
This commit is contained in:
Elias Norberg 2019-09-30 03:07:43 +02:00 • committed by Lunny Xiao
parent 9c2a58456a
commit 49547ea158
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
models/pull.go
View file

@ -353,14 +353,17 @@ func (pr *PullRequest) GetLastCommitStatus() (status *CommitStatus, err error) {
return nil, err
}
repo := pr.HeadRepo
lastCommitID, err := headGitRepo.GetBranchCommitID(pr.HeadBranch)
if err != nil {
return nil, err
}
var statusList []*CommitStatus
statusList, err = GetLatestCommitStatus(repo, lastCommitID, 0)
err = pr.LoadBaseRepo()
if err != nil {
return nil, err
}
statusList, err := GetLatestCommitStatus(pr.BaseRepo, lastCommitID, 0)
if err != nil {
return nil, err
}