mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Fix AGit checkout instruction 

The checkout instruction for pull requests created with the AGit
workflow where incorrect.
This commit is contained in:
Beowulf 2024-07-13 18:05:08 +02:00
parent 28b81cd878
commit 0a5fa31edb
No known key found for this signature in database
GPG Key ID: 44225F5F2792841D
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/repo/issue/view_content/pull_merge_instruction.tmpl
View File

@ -9,10 +9,10 @@
<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>