Compare commits

...

3 Commits

Author SHA1 Message Date
Giteabot
148f6e3776
Change the default branch in the agit docs (#27621) (#27623)
Backport #27621 by @lng2020

It's main now.
relevant #27579

Co-authored-by: Nanguan Lin <70063547+lng2020@users.noreply.github.com>
2023-10-15 09:16:15 +08:00
Nanguan Lin
fa6941cf8c
Backport manually for a tmpl issue in v1.21 (#27612)
backport #27514 
close #27607
2023-10-14 11:51:58 +00:00
Giteabot
54dccbeb2e
Fix build errors on BSD (in BSDMakefile) (#27594) (#27608)
Backport #27594 by @sryze

1. `make build` fails because `||` and `&&` have the same precedence in
sh/bash, so the `false` command always evaluated (leading to an error).

   ```
   + which gmake /usr/local/bin/gmake
   + false

   *** Failed target:  .BEGIN
*** Failed command: which "gmake" || printf "Error: GNU Make is
required!\n\n" 1>&2 && false
   *** Error code 1
   ```

2. When `GPREFIX` is set to an empty string with quotation marks,
`gmake` mistakenly thinks that it's a file name:

   ``` gmake: *** empty string invalid as file name.  Stop. ```

Co-authored-by: Sergey Zolotarev <sryze@protonmail.com>
2023-10-14 07:29:55 +00:00
4 changed files with 9 additions and 9 deletions

View File

@ -42,13 +42,13 @@ GARGS = "--no-print-directory"
# The GNU convention is to use the lowercased `prefix` variable/macro to # The GNU convention is to use the lowercased `prefix` variable/macro to
# specify the installation directory. Humor them. # specify the installation directory. Humor them.
GPREFIX = "" GPREFIX =
.if defined(PREFIX) && ! defined(prefix) .if defined(PREFIX) && ! defined(prefix)
GPREFIX = 'prefix = "$(PREFIX)"' GPREFIX = 'prefix = "$(PREFIX)"'
.endif .endif
.BEGIN: .SILENT .BEGIN: .SILENT
which $(GMAKE) || printf "Error: GNU Make is required!\n\n" 1>&2 && false which $(GMAKE) || (printf "Error: GNU Make is required!\n\n" 1>&2 && false)
.PHONY: FRC .PHONY: FRC
$(.TARGETS): FRC $(.TARGETS): FRC

View File

@ -26,7 +26,7 @@ This can be done by pushing to the branch followed by a specific refspec (a loca
The following example illustrates this: The following example illustrates this:
```shell ```shell
git push origin HEAD:refs/for/master git push origin HEAD:refs/for/main
``` ```
The command has the following structure: The command has the following structure:
@ -42,8 +42,8 @@ The command has the following structure:
- `description`: The PR description - `description`: The PR description
- `force-push`: confirm force update the target branch - `force-push`: confirm force update the target branch
Here's another advanced example for creating a new PR targeting `master` with `topic`, `title`, and `description`: Here's another advanced example for creating a new PR targeting `main` with `topic`, `title`, and `description`:
```shell ```shell
git push origin HEAD:refs/for/master -o topic="Topic of my PR" -o title="Title of the PR" -o description="# The PR Description\nThis can be **any** markdown content.\n- [x] Ok" git push origin HEAD:refs/for/main -o topic="Topic of my PR" -o title="Title of the PR" -o description="# The PR Description\nThis can be **any** markdown content.\n- [x] Ok"
``` ```

View File

@ -26,7 +26,7 @@ Agit 允许在推送代码到远程仓库时创建 PR合并请求
下面的示例说明了这一点: 下面的示例说明了这一点:
```shell ```shell
git push origin HEAD:refs/for/master git push origin HEAD:refs/for/main
``` ```
该命令的结构如下: 该命令的结构如下:
@ -42,8 +42,8 @@ git push origin HEAD:refs/for/master
- `description`PR 的描述 - `description`PR 的描述
- `force-push`:确认强制更新目标分支 - `force-push`:确认强制更新目标分支
下面是另一个高级示例,用于创建一个以 `topic``title``description` 为参数的新 PR目标分支是 `master` 下面是另一个高级示例,用于创建一个以 `topic``title``description` 为参数的新 PR目标分支是 `main`
```shell ```shell
git push origin HEAD:refs/for/master -o topic="Topic of my PR" -o title="Title of the PR" -o description="# The PR Description\nThis can be **any** markdown content.\n- [x] Ok" git push origin HEAD:refs/for/main -o topic="Topic of my PR" -o title="Title of the PR" -o description="# The PR Description\nThis can be **any** markdown content.\n- [x] Ok"
``` ```

View File

@ -134,7 +134,7 @@
<span class="no-select item {{if .Project}}gt-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span> <span class="no-select item {{if .Project}}gt-hidden{{end}}">{{ctx.Locale.Tr "repo.issues.new.no_projects"}}</span>
<div class="selected"> <div class="selected">
{{if .Project}} {{if .Project}}
<a class="item muted sidebar-item-link" href="{{.Project.Link}}"> <a class="item muted sidebar-item-link" href="{{.Project.Link ctx}}">
{{svg .Project.IconName 18 "gt-mr-3"}}{{.Project.Title}} {{svg .Project.IconName 18 "gt-mr-3"}}{{.Project.Title}}
</a> </a>
{{end}} {{end}}