Skip to content

Commit b3087b4

Browse files
Azure PR response reads head and base ref
1 parent c3d9c6d commit b3087b4

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

scm/driver/azure/pr.go

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,22 +254,40 @@ func convertPullRequests(from *prList) []*scm.PullRequest {
254254
}
255255

256256
func convertPullRequest(from *pr) *scm.PullRequest {
257+
var (
258+
headSha string
259+
baseSha string
260+
)
261+
if from.LastMergeSourceCommit != nil {
262+
headSha = from.LastMergeSourceCommit.CommitID
263+
} else {
264+
headSha = ""
265+
}
266+
267+
if from.LastMergeTargetCommit != nil {
268+
baseSha = from.LastMergeTargetCommit.CommitID
269+
} else {
270+
baseSha = ""
271+
}
272+
257273
return &scm.PullRequest{
258274
Number: from.PullRequestID,
259275
Title: from.Title,
260276
Body: from.Description,
261-
Sha: from.LastMergeSourceCommit.CommitID,
277+
Sha: headSha,
262278
Source: scm.TrimRef(from.SourceRefName),
263279
Target: scm.TrimRef(from.TargetRefName),
264280
Link: fmt.Sprintf("%s/pullrequest/%d", from.Repository.WebURL, from.PullRequestID),
265281
Closed: from.ClosedDate.Valid,
266282
Merged: from.Status == "completed",
267283
Ref: fmt.Sprintf("refs/pull/%d/merge", from.PullRequestID),
268284
Head: scm.PullRequestBranch{
269-
Sha: from.LastMergeSourceCommit.CommitID,
285+
Sha: headSha,
286+
Ref: scm.TrimRef(from.SourceRefName),
270287
},
271288
Base: scm.PullRequestBranch{
272-
Sha: from.LastMergeTargetCommit.CommitID,
289+
Sha: baseSha,
290+
Ref: scm.TrimRef(from.TargetRefName),
273291
},
274292
Author: scm.User{
275293
Login: from.CreatedBy.UniqueName,

0 commit comments

Comments
 (0)