Skip to content

Commit 8ee9603

Browse files
authored
Fix some missed GitHeadRefName when renaming (#35102)
1 parent de1114b commit 8ee9603

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

models/issues/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer)
413413
return committer.Commit()
414414
}
415415

416-
// GetGitRefName returns git ref for hidden pull request branch
416+
// GetGitHeadRefName returns git ref for hidden pull request branch
417417
func (pr *PullRequest) GetGitHeadRefName() string {
418418
return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index)
419419
}

modules/migration/pullrequest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (p *PullRequest) IsForkPullRequest() bool {
4949
return p.Head.RepoFullName() != p.Base.RepoFullName()
5050
}
5151

52-
// GetGitRefName returns pull request relative path to head
52+
// GetGitHeadRefName returns pull request relative path to head
5353
func (p PullRequest) GetGitHeadRefName() string {
5454
return fmt.Sprintf("%s%d/head", git.PullPrefix, p.Number)
5555
}

templates/repo/issue/view_content/pull_merge_instruction.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{{if eq .PullRequest.Flow 0}}
1212
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
1313
{{else}}
14-
<div>git fetch -u origin {{.PullRequest.GetGitRefName}}:{{$localBranch}}</div>
14+
<div>git fetch -u origin {{.PullRequest.GetGitHeadRefName}}:{{$localBranch}}</div>
1515
{{end}}
1616
<div>git checkout {{$localBranch}}</div>
1717
</div>

0 commit comments

Comments
 (0)