mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-23 20:17:03 +01:00
Fix AGit checkout instruction
The checkout instruction for pull requests created with the AGit
workflow where incorrect.
(cherry picked from commit 0a5fa31edb
)
This commit is contained in:
parent
c304a16cf8
commit
cb297a6f6f
1 changed files with 3 additions and 3 deletions
|
@ -8,11 +8,11 @@
|
||||||
{{end}}
|
{{end}}
|
||||||
<div class="ui secondary segment">
|
<div class="ui secondary segment">
|
||||||
{{if eq .PullRequest.Flow 0}}
|
{{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>
|
<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>
|
||||||
<div>git checkout {{$localBranch}}</div>
|
|
||||||
{{else}}
|
{{else}}
|
||||||
<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
|
<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
|
||||||
{{end}}
|
{{end}}
|
||||||
|
<div>git checkout {{$localBranch}}</div>
|
||||||
</div>
|
</div>
|
||||||
{{if .ShowMergeInstructions}}
|
{{if .ShowMergeInstructions}}
|
||||||
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>
|
||||||
|
|
Loading…
Reference in a new issue