Skip to content

Commit 531f36e

Browse files
wxiaoguangyp05327
wxiaoguang
and
yp05327
authored
Fix git remote error check, fix dependencies, fix js error (#33129) (#33133)
And update some dependencies to fix bugs. Backport #33129, #33136 Fix #32889 Fix #33141 Fix #33139 --------- Co-authored-by: yp05327 <[email protected]>
1 parent b4f0eed commit 531f36e

File tree

9 files changed

+83
-69
lines changed

9 files changed

+83
-69
lines changed

‎assets/go-licenses.json

+11-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

+14-13
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ require (
2424
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
2525
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
2626
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
27-
github.com/ProtonMail/go-crypto v1.0.0
27+
github.com/ProtonMail/go-crypto v1.1.4
2828
github.com/PuerkitoBio/goquery v1.10.0
2929
github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
30-
github.com/alecthomas/chroma/v2 v2.14.0
30+
github.com/alecthomas/chroma/v2 v2.15.0
3131
github.com/aws/aws-sdk-go-v2/credentials v1.17.42
3232
github.com/aws/aws-sdk-go-v2/service/codecommit v1.27.3
3333
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
@@ -54,8 +54,8 @@ require (
5454
github.com/go-chi/cors v1.2.1
5555
github.com/go-co-op/gocron v1.37.0
5656
github.com/go-enry/go-enry/v2 v2.9.1
57-
github.com/go-git/go-billy/v5 v5.6.0
58-
github.com/go-git/go-git/v5 v5.12.0
57+
github.com/go-git/go-billy/v5 v5.6.1
58+
github.com/go-git/go-git/v5 v5.13.1
5959
github.com/go-ldap/ldap/v3 v3.4.8
6060
github.com/go-redsync/redsync/v4 v4.13.0
6161
github.com/go-sql-driver/mysql v1.8.1
@@ -107,7 +107,7 @@ require (
107107
github.com/sassoftware/go-rpmutils v0.4.0
108108
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
109109
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
110-
github.com/stretchr/testify v1.9.0
110+
github.com/stretchr/testify v1.10.0
111111
github.com/syndtr/goleveldb v1.0.0
112112
github.com/tstranex/u2f v1.0.0
113113
github.com/ulikunitz/xz v0.5.12
@@ -119,14 +119,14 @@ require (
119119
github.com/yuin/goldmark v1.7.8
120120
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
121121
github.com/yuin/goldmark-meta v1.1.0
122-
golang.org/x/crypto v0.31.0
122+
golang.org/x/crypto v0.32.0
123123
golang.org/x/image v0.21.0
124-
golang.org/x/net v0.33.0
124+
golang.org/x/net v0.34.0
125125
golang.org/x/oauth2 v0.23.0
126126
golang.org/x/sync v0.10.0
127-
golang.org/x/sys v0.28.0
127+
golang.org/x/sys v0.29.0
128128
golang.org/x/text v0.21.0
129-
golang.org/x/tools v0.26.0
129+
golang.org/x/tools v0.29.0
130130
google.golang.org/grpc v1.67.1
131131
google.golang.org/protobuf v1.35.1
132132
gopkg.in/ini.v1 v1.67.0
@@ -187,7 +187,7 @@ require (
187187
github.com/couchbase/gomemcached v0.3.2 // indirect
188188
github.com/couchbase/goutils v0.1.2 // indirect
189189
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
190-
github.com/cyphar/filepath-securejoin v0.3.4 // indirect
190+
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
191191
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
192192
github.com/davidmz/go-pageant v1.0.2 // indirect
193193
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -220,7 +220,7 @@ require (
220220
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
221221
github.com/golang-sql/sqlexp v0.1.0 // indirect
222222
github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
223-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
223+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
224224
github.com/golang/protobuf v1.5.4 // indirect
225225
github.com/golang/snappy v0.0.4 // indirect
226226
github.com/google/btree v1.1.3 // indirect
@@ -255,6 +255,7 @@ require (
255255
github.com/mitchellh/copystructure v1.2.0 // indirect
256256
github.com/mitchellh/mapstructure v1.5.0 // indirect
257257
github.com/mitchellh/reflectwalk v1.0.2 // indirect
258+
github.com/mmcloughlin/avo v0.6.0 // indirect
258259
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
259260
github.com/modern-go/reflect2 v1.0.2 // indirect
260261
github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
@@ -266,7 +267,7 @@ require (
266267
github.com/onsi/ginkgo v1.16.5 // indirect
267268
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
268269
github.com/pierrec/lz4/v4 v4.1.21 // indirect
269-
github.com/pjbgf/sha1cd v0.3.0 // indirect
270+
github.com/pjbgf/sha1cd v0.3.1 // indirect
270271
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
271272
github.com/prometheus/client_model v0.6.1 // indirect
272273
github.com/prometheus/common v0.60.1 // indirect
@@ -306,7 +307,7 @@ require (
306307
go.uber.org/multierr v1.11.0 // indirect
307308
go.uber.org/zap v1.27.0 // indirect
308309
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
309-
golang.org/x/mod v0.21.0 // indirect
310+
golang.org/x/mod v0.22.0 // indirect
310311
golang.org/x/time v0.7.0 // indirect
311312
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
312313
gopkg.in/warnings.v0 v0.1.2 // indirect

‎go.sum

+34-44
Large diffs are not rendered by default.

‎modules/git/remote.go

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ package git
55

66
import (
77
"context"
8+
"strings"
89

910
giturl "code.gitea.io/gitea/modules/git/url"
1011
)
@@ -37,3 +38,12 @@ func GetRemoteURL(ctx context.Context, repoPath, remoteName string) (*giturl.Git
3738
}
3839
return giturl.Parse(addr)
3940
}
41+
42+
// IsRemoteNotExistError checks the prefix of the error message to see whether a remote does not exist.
43+
func IsRemoteNotExistError(err error) bool {
44+
// see: https://github.com/go-gitea/gitea/issues/32889#issuecomment-2571848216
45+
// Should not add space in the end, sometimes git will add a `:`
46+
prefix1 := "exit status 128 - fatal: No such remote" // git < 2.30
47+
prefix2 := "exit status 2 - error: No such remote" // git >= 2.30
48+
return strings.HasPrefix(err.Error(), prefix1) || strings.HasPrefix(err.Error(), prefix2)
49+
}

‎modules/markup/orgmode/orgmode_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func HelloWorld() {
103103
}
104104
#+end_src
105105
`, `<div class="src src-go">
106-
<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
107-
</span><span class="c1"></span><span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
106+
<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;</span>
107+
<span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
108108
<span class="nx">fmt</span><span class="p">.</span><span class="nf">Println</span><span class="p">(</span><span class="s">&#34;Hello World&#34;</span><span class="p">)</span>
109109
<span class="p">}</span></code></pre>
110110
</div>`)

‎modules/repository/branch.go

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package repository
66
import (
77
"context"
88
"fmt"
9+
"strings"
910

1011
"code.gitea.io/gitea/models/db"
1112
git_model "code.gitea.io/gitea/models/git"
@@ -51,6 +52,9 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
5152
{
5253
branches, _, err := gitRepo.GetBranchNames(0, 0)
5354
if err != nil {
55+
if strings.Contains(err.Error(), "ref file is empty") {
56+
return 0, nil
57+
}
5458
return 0, err
5559
}
5660
log.Trace("SyncRepoBranches[%s]: branches[%d]: %v", repo.FullName(), len(branches), branches)

‎services/mirror/mirror_pull.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
4141
repoPath := m.GetRepository(ctx).RepoPath()
4242
// Remove old remote
4343
_, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: repoPath})
44-
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
44+
if err != nil && !git.IsRemoteNotExistError(err) {
4545
return err
4646
}
4747

@@ -52,7 +52,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
5252
cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, addr, repoPath))
5353
}
5454
_, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath})
55-
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
55+
if err != nil && !git.IsRemoteNotExistError(err) {
5656
return err
5757
}
5858

@@ -61,7 +61,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
6161
wikiRemotePath := repo_module.WikiRemoteURL(ctx, addr)
6262
// Remove old remote of wiki
6363
_, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: wikiPath})
64-
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
64+
if err != nil && !git.IsRemoteNotExistError(err) {
6565
return err
6666
}
6767

@@ -72,7 +72,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
7272
cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, wikiRemotePath, wikiPath))
7373
}
7474
_, _, err = cmd.RunStdString(&git.RunOpts{Dir: wikiPath})
75-
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
75+
if err != nil && !git.IsRemoteNotExistError(err) {
7676
return err
7777
}
7878
}

‎services/repository/migrate.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"errors"
99
"fmt"
1010
"net/http"
11-
"strings"
1211
"time"
1312

1413
"code.gitea.io/gitea/models/db"
@@ -255,10 +254,10 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
255254
func cleanUpMigrateGitConfig(ctx context.Context, repoPath string) error {
256255
cmd := git.NewCommand(ctx, "remote", "rm", "origin")
257256
// if the origin does not exist
258-
_, stderr, err := cmd.RunStdString(&git.RunOpts{
257+
_, _, err := cmd.RunStdString(&git.RunOpts{
259258
Dir: repoPath,
260259
})
261-
if err != nil && !strings.HasPrefix(stderr, "fatal: No such remote") {
260+
if err != nil && !git.IsRemoteNotExistError(err) {
262261
return err
263262
}
264263
return nil
@@ -277,7 +276,7 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo
277276
}
278277

279278
_, _, err := git.NewCommand(ctx, "remote", "rm", "origin").RunStdString(&git.RunOpts{Dir: repoPath})
280-
if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
279+
if err != nil && !git.IsRemoteNotExistError(err) {
281280
return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err)
282281
}
283282

‎web_src/js/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function parseIssueHref(href: string): IssuePathInfo {
4040
export function parseIssueNewHref(href: string): IssuePathInfo {
4141
const path = (href || '').replace(/[#?].*$/, '');
4242
const [_, ownerName, repoName, pathTypeField] = /([^/]+)\/([^/]+)\/(issues\/new|compare\/.+\.\.\.)/.exec(path) || [];
43-
const pathType = pathTypeField.startsWith('issues/new') ? 'issues' : 'pulls';
43+
const pathType = pathTypeField ? (pathTypeField.startsWith('issues/new') ? 'issues' : 'pulls') : undefined;
4444
return {ownerName, repoName, pathType};
4545
}
4646

0 commit comments

Comments
 (0)