Skip to content

Commit d3e8387

Browse files
committed
impruve
1 parent d5ab102 commit d3e8387

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

modules/convert/pull.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
package convert
66

77
import (
8+
"fmt"
9+
810
"code.gitea.io/gitea/models"
911
"code.gitea.io/gitea/modules/git"
1012
"code.gitea.io/gitea/modules/log"
@@ -23,10 +25,12 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
2325
headCommit *git.Commit
2426
err error
2527
)
28+
2629
if err = pr.Issue.LoadRepo(); err != nil {
27-
log.Error("loadRepo[%d]: %v", pr.ID, err)
30+
log.Error("pr.Issue.loadRepo[%d]: %v", pr.ID, err)
2831
return nil
2932
}
33+
3034
apiIssue := pr.Issue.APIFormat()
3135
if pr.BaseRepo == nil {
3236
pr.BaseRepo, err = models.GetRepositoryByID(pr.BaseRepoID)
@@ -44,11 +48,6 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
4448
}
4549
}
4650

47-
if err = pr.Issue.LoadRepo(); err != nil {
48-
log.Error("pr.Issue.loadRepo[%d]: %v", pr.ID, err)
49-
return nil
50-
}
51-
5251
apiPullRequest := &api.PullRequest{
5352
ID: pr.ID,
5453
URL: pr.Issue.HTMLURL(),
@@ -132,7 +131,7 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
132131
} else {
133132
apiPullRequest.Head = &api.PRBranchInfo{
134133
Name: pr.HeadBranch,
135-
Ref: pr.HeadBranch,
134+
Ref: fmt.Sprintf("refs/pull/%d/head", pr.Index),
136135
RepoID: -1,
137136
}
138137
}

0 commit comments

Comments
 (0)