From 49547ea158ff2b028013cdcc12d18efc0556aac0 Mon Sep 17 00:00:00 2001 From: Elias Norberg Date: Mon, 30 Sep 2019 03:07:43 +0200 Subject: Show correct commit status in PR list (#8316) * Use correct index when fetching commit status Signed-off-by: Elias Norberg * Compare against base repo to avoid mismatch when merging from fork Signed-off-by: Elias Norberg --- models/pull.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'models') diff --git a/models/pull.go b/models/pull.go index 60ccb144f5..b41fb004e1 100644 --- a/models/pull.go +++ b/models/pull.go @@ -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 } -- cgit v1.2.3