mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
d16daed041
Backport #39483 Fix the bugs: * Commit graph page doesn't show * PR command line instructions are wrong Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: silverwind <me@silverwind.io>
62 lines
2.6 KiB
Handlebars
62 lines
2.6 KiB
Handlebars
{{$data := $.MergeBoxData}}
|
|
{{$pull := $.PullRequest}}
|
|
<details>
|
|
<summary class="tw-pl-1">{{/* align with other item icon & text */}}
|
|
<span class="tw-pl-2">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}}</span>
|
|
</summary>
|
|
<div class="tw-my-[5px]">
|
|
<div>
|
|
<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}
|
|
</div>
|
|
{{$args := $pull.GetInstructionsCliArgs}}
|
|
<div class="ui secondary segment tw-font-mono">
|
|
{{$gitRemoteName := ctx.RootData.SystemConfig.Repository.GitGuideRemoteName.Value ctx}}
|
|
{{if eq $pull.Flow 0}}
|
|
<div>git fetch -u {{if ne $pull.HeadRepo.ID $pull.BaseRepo.ID}}{{$pull.HeadRepo.HTMLURL ctx}}{{else}}{{$gitRemoteName}}{{end}} {{$args.HeadBranchArg}}:{{$args.LocalBranchArg}}</div>
|
|
{{else}}
|
|
<div>git fetch -u {{$gitRemoteName}} {{$pull.GetGitHeadRefName}}:{{$args.LocalBranchArg}}</div>
|
|
{{end}}
|
|
<div>git checkout {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
{{if $data.ShowMergeInstructions}}
|
|
<div>
|
|
<h3 class="tw-m-0">{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
|
|
{{if not $data.AutodetectManualMerge}}
|
|
<div>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</div>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui secondary segment tw-font-mono">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge --no-ff {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge --ff-only {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git checkout {{$args.LocalBranchArg}}</div>
|
|
<div>git rebase {{$args.BaseBranchArg}}</div>
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge --no-ff {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge --squash {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge --ff-only {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git checkout {{$args.BaseBranchArg}}</div>
|
|
<div>git merge {{$args.LocalBranchArg}}</div>
|
|
</div>
|
|
<div>git push {{$gitRemoteName}} {{$args.BaseBranchArg}}</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</details>
|