loading up the forgejo repo on tangled to test page performance
Merge pull request 'Fix AGit pull request instructions' (#4475) from beowulf/fix-agit-checkout-instruction into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/4475
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
+3
-3
+3
-3
templates/repo/issue/view_content/pull_merge_instruction.tmpl
+3
-3
templates/repo/issue/view_content/pull_merge_instruction.tmpl
···
8
8
{{end}}
9
9
<div class="ui secondary segment">
10
10
{{if eq .PullRequest.Flow 0}}
11
-
<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>
12
-
<div>git checkout {{$localBranch}}</div>
11
+
<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>
13
12
{{else}}
14
-
<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
13
+
<div>git fetch -u origin +refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}</div>
15
14
{{end}}
15
+
<div>git checkout {{$localBranch}}</div>
16
16
</div>
17
17
{{if .ShowMergeInstructions}}
18
18
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>