Skip to content

Commit 177da71

Browse files
authored
[API] get pull, return head branch sha, even if deleted (#14931)
* API: return head branch sha, even if deleted * relax if ref not resolvable
1 parent 14d8cb7 commit 177da71

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

modules/convert/pull.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,24 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
134134
}
135135
}
136136

137+
if len(apiPullRequest.Head.Sha) == 0 && len(apiPullRequest.Head.Ref) != 0 {
138+
baseGitRepo, err := git.OpenRepository(pr.BaseRepo.RepoPath())
139+
if err != nil {
140+
log.Error("OpenRepository[%s]: %v", pr.BaseRepo.RepoPath(), err)
141+
return nil
142+
}
143+
defer baseGitRepo.Close()
144+
refs, err := baseGitRepo.GetRefsFiltered(apiPullRequest.Head.Ref)
145+
if err != nil {
146+
log.Error("GetRefsFiltered[%s]: %v", apiPullRequest.Head.Ref, err)
147+
return nil
148+
} else if len(refs) == 0 {
149+
log.Error("unable to resolve PR head ref")
150+
} else {
151+
apiPullRequest.Head.Sha = refs[0].Object.String()
152+
}
153+
}
154+
137155
if pr.Status != models.PullRequestStatusChecking {
138156
mergeable := !(pr.Status == models.PullRequestStatusConflict || pr.Status == models.PullRequestStatusError) && !pr.IsWorkInProgress()
139157
apiPullRequest.Mergeable = mergeable

0 commit comments

Comments
 (0)