Skip to content

Commit

Permalink
Merge pull request #1 from komony/qa
Browse files Browse the repository at this point in the history
Adding latest ignoreuimerge fix
  • Loading branch information
komony authored Apr 23, 2019
2 parents c9032f3 + 3a5526c commit 7f2a541
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion remote/github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -1113,7 +1113,13 @@ func getPullRequestCommits(ctx context.Context, client *github.Client, r *model.
res := []model.Commit{}
for _, c := range commits {
parents := []string{}
for _, p := range c.Commit.Parents {
// At some point the parents stopped appearing on the git commit, and started appearing on the github commit.
// This checks both places.
pList := c.Commit.Parents
if pList == nil {
pList = c.Parents
}
for _, p := range pList {
parents = append(parents, p.GetSHA())
}
res = append(res, model.Commit{
Expand Down

0 comments on commit 7f2a541

Please sign in to comment.