File tree Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Original file line number Diff line number Diff line change 5
5
package convert
6
6
7
7
import (
8
+ "fmt"
9
+
8
10
"code.gitea.io/gitea/models"
9
11
"code.gitea.io/gitea/modules/git"
10
12
"code.gitea.io/gitea/modules/log"
@@ -23,10 +25,12 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
23
25
headCommit * git.Commit
24
26
err error
25
27
)
28
+
26
29
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 )
28
31
return nil
29
32
}
33
+
30
34
apiIssue := pr .Issue .APIFormat ()
31
35
if pr .BaseRepo == nil {
32
36
pr .BaseRepo , err = models .GetRepositoryByID (pr .BaseRepoID )
@@ -44,11 +48,6 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
44
48
}
45
49
}
46
50
47
- if err = pr .Issue .LoadRepo (); err != nil {
48
- log .Error ("pr.Issue.loadRepo[%d]: %v" , pr .ID , err )
49
- return nil
50
- }
51
-
52
51
apiPullRequest := & api.PullRequest {
53
52
ID : pr .ID ,
54
53
URL : pr .Issue .HTMLURL (),
@@ -132,7 +131,7 @@ func ToAPIPullRequest(pr *models.PullRequest) *api.PullRequest {
132
131
} else {
133
132
apiPullRequest .Head = & api.PRBranchInfo {
134
133
Name : pr .HeadBranch ,
135
- Ref : pr .HeadBranch ,
134
+ Ref : fmt . Sprintf ( "refs/pull/%d/head" , pr .Index ) ,
136
135
RepoID : - 1 ,
137
136
}
138
137
}
You can’t perform that action at this time.
0 commit comments