Skip to content

Commit 5a04bc4

Browse files
Merge remote-tracking branch 'remotes/from/ce/release/1.20.x' into release/1.20.x
2 parents 5f77891 + 93da8ce commit 5a04bc4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tools/pipeline/internal/pkg/github/copy_pull_request.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func (r *CopyPullRequestReq) Run(
155155
Track: []string{prBranch},
156156
Fetch: true,
157157
Name: r.FromOrigin,
158-
URL: fmt.Sprintf("https://github.com/%s/%s.git", r.FromOwner, r.FromRepo),
158+
URL: res.OriginPullRequest.GetHead().GetRepo().GetCloneURL(),
159159
})
160160
if err != nil {
161161
err = fmt.Errorf("fetching target branch base ref: %s, %w", remoteRes.String(), err)
@@ -400,11 +400,11 @@ func (r *CopyPullRequestRes) ToTable(err error) table.Writer {
400400
if r.Request != nil {
401401
from := r.Request.FromOwner + "/" + r.Request.FromRepo
402402
if pr := r.OriginPullRequest; pr != nil {
403-
from = fmt.Sprintf("[%s#%d](%s)", from, pr.GetID(), pr.GetHTMLURL())
403+
from = fmt.Sprintf("[%s#%d](%s)", from, pr.GetNumber(), pr.GetHTMLURL())
404404
}
405405
to := r.Request.ToOwner + "/" + r.Request.ToRepo
406406
if pr := r.PullRequest; pr != nil {
407-
to = fmt.Sprintf("[%s#%d](%s)", to, pr.GetID(), pr.GetHTMLURL())
407+
to = fmt.Sprintf("[%s#%d](%s)", to, pr.GetNumber(), pr.GetHTMLURL())
408408
}
409409
row = table.Row{from, to}
410410
}

0 commit comments

Comments
 (0)