diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2025-07-17 22:01:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-17 14:01:11 +0000 |
| commit | 8ee96039aa945b9eef1eb7dfc88113ec466558ff (patch) | |
| tree | aa9319d32542ec24f6928c30a7bf7906e2f64757 | |
| parent | de1114b4e8302ddf67fa877b17369262c604ab47 (diff) | |
| download | gitea-8ee96039aa945b9eef1eb7dfc88113ec466558ff.tar.gz gitea-8ee96039aa945b9eef1eb7dfc88113ec466558ff.zip | |
Fix some missed GitHeadRefName when renaming (#35102)
| -rw-r--r-- | models/issues/pull.go | 2 | ||||
| -rw-r--r-- | modules/migration/pullrequest.go | 2 | ||||
| -rw-r--r-- | templates/repo/issue/view_content/pull_merge_instruction.tmpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/models/issues/pull.go b/models/issues/pull.go index 2ff471b641..4c25b6f0c8 100644 --- a/models/issues/pull.go +++ b/models/issues/pull.go @@ -413,7 +413,7 @@ func (pr *PullRequest) getReviewedByLines(ctx context.Context, writer io.Writer) return committer.Commit() } -// GetGitRefName returns git ref for hidden pull request branch +// GetGitHeadRefName returns git ref for hidden pull request branch func (pr *PullRequest) GetGitHeadRefName() string { return fmt.Sprintf("%s%d/head", git.PullPrefix, pr.Index) } diff --git a/modules/migration/pullrequest.go b/modules/migration/pullrequest.go index c832879630..cccab3fd7e 100644 --- a/modules/migration/pullrequest.go +++ b/modules/migration/pullrequest.go @@ -49,7 +49,7 @@ func (p *PullRequest) IsForkPullRequest() bool { return p.Head.RepoFullName() != p.Base.RepoFullName() } -// GetGitRefName returns pull request relative path to head +// GetGitHeadRefName returns pull request relative path to head func (p PullRequest) GetGitHeadRefName() string { return fmt.Sprintf("%s%d/head", git.PullPrefix, p.Number) } diff --git a/templates/repo/issue/view_content/pull_merge_instruction.tmpl b/templates/repo/issue/view_content/pull_merge_instruction.tmpl index 7362908c55..9dbcbeee21 100644 --- a/templates/repo/issue/view_content/pull_merge_instruction.tmpl +++ b/templates/repo/issue/view_content/pull_merge_instruction.tmpl @@ -11,7 +11,7 @@ {{if eq .PullRequest.Flow 0}} <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> {{else}} - <div>git fetch -u origin {{.PullRequest.GetGitRefName}}:{{$localBranch}}</div> + <div>git fetch -u origin {{.PullRequest.GetGitHeadRefName}}:{{$localBranch}}</div> {{end}} <div>git checkout {{$localBranch}}</div> </div> |