Fix git remote error check, fix dependencies, fix js error (go-gitea#33129) (go-gitea#33133)

And update some dependencies to fix bugs. Backport go-gitea#33129, go-gitea#33136 Fix go-gitea#32889 Fix go-gitea#33141 Fix go-gitea#33139 --------- Co-authored-by: yp05327 <576951401@qq.com>

Author: wxiaoguang

assets/go-licenses.json

@@ -24,10 +24,10 @@ require (
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
 github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.1
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
-github.com/ProtonMail/go-crypto v1.0.0
+github.com/ProtonMail/go-crypto v1.1.4
 github.com/PuerkitoBio/goquery v1.10.0
 github.com/SaveTheRbtz/zstd-seekable-format-go/pkg v0.7.3
-github.com/alecthomas/chroma/v2 v2.14.0
+github.com/alecthomas/chroma/v2 v2.15.0
 github.com/aws/aws-sdk-go-v2/credentials v1.17.42
 github.com/aws/aws-sdk-go-v2/service/codecommit v1.27.3
 github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
@@ -54,8 +54,8 @@ require (
 github.com/go-chi/cors v1.2.1
 github.com/go-co-op/gocron v1.37.0
 github.com/go-enry/go-enry/v2 v2.9.1
-github.com/go-git/go-billy/v5 v5.6.0
-github.com/go-git/go-git/v5 v5.12.0
+github.com/go-git/go-billy/v5 v5.6.1
+github.com/go-git/go-git/v5 v5.13.1
 github.com/go-ldap/ldap/v3 v3.4.8
 github.com/go-redsync/redsync/v4 v4.13.0
 github.com/go-sql-driver/mysql v1.8.1
@@ -107,7 +107,7 @@ require (
 github.com/sassoftware/go-rpmutils v0.4.0
 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
 github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92
-github.com/stretchr/testify v1.9.0
+github.com/stretchr/testify v1.10.0
 github.com/syndtr/goleveldb v1.0.0
 github.com/tstranex/u2f v1.0.0
 github.com/ulikunitz/xz v0.5.12
@@ -119,14 +119,14 @@ require (
 github.com/yuin/goldmark v1.7.8
 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
 github.com/yuin/goldmark-meta v1.1.0
-golang.org/x/crypto v0.31.0
+golang.org/x/crypto v0.32.0
 golang.org/x/image v0.21.0
-golang.org/x/net v0.33.0
+golang.org/x/net v0.34.0
 golang.org/x/oauth2 v0.23.0
 golang.org/x/sync v0.10.0
-golang.org/x/sys v0.28.0
+golang.org/x/sys v0.29.0
 golang.org/x/text v0.21.0
-golang.org/x/tools v0.26.0
+golang.org/x/tools v0.29.0
 google.golang.org/grpc v1.67.1
 google.golang.org/protobuf v1.35.1
 gopkg.in/ini.v1 v1.67.0
@@ -187,7 +187,7 @@ require (
 github.com/couchbase/gomemcached v0.3.2 // indirect
 github.com/couchbase/goutils v0.1.2 // indirect
 github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
-github.com/cyphar/filepath-securejoin v0.3.4 // indirect
+github.com/cyphar/filepath-securejoin v0.3.6 // indirect
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 github.com/davidmz/go-pageant v1.0.2 // indirect
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -220,7 +220,7 @@ require (
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 github.com/golang-sql/sqlexp v0.1.0 // indirect
 github.com/golang/geo v0.0.0-20230421003525-6adc56603217 // indirect
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 github.com/golang/protobuf v1.5.4 // indirect
 github.com/golang/snappy v0.0.4 // indirect
 github.com/google/btree v1.1.3 // indirect
@@ -255,6 +255,7 @@ require (
 github.com/mitchellh/copystructure v1.2.0 // indirect
 github.com/mitchellh/mapstructure v1.5.0 // indirect
 github.com/mitchellh/reflectwalk v1.0.2 // indirect
+github.com/mmcloughlin/avo v0.6.0 // indirect
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 github.com/modern-go/reflect2 v1.0.2 // indirect
 github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 // indirect
@@ -266,7 +267,7 @@ require (
 github.com/onsi/ginkgo v1.16.5 // indirect
 github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 github.com/pierrec/lz4/v4 v4.1.21 // indirect
-github.com/pjbgf/sha1cd v0.3.0 // indirect
+github.com/pjbgf/sha1cd v0.3.1 // indirect
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 github.com/prometheus/client_model v0.6.1 // indirect
 github.com/prometheus/common v0.60.1 // indirect
@@ -306,7 +307,7 @@ require (
 go.uber.org/multierr v1.11.0 // indirect
 go.uber.org/zap v1.27.0 // indirect
 golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
-golang.org/x/mod v0.21.0 // indirect
+golang.org/x/mod v0.22.0 // indirect
 golang.org/x/time v0.7.0 // indirect
 google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
 gopkg.in/warnings.v0 v0.1.2 // indirect

go.mod

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

go.sum

@@ -103,8 +103,8 @@ func HelloWorld() {
 }
 #+end_src
 `, `<div class="src src-go">
-<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;
-</span><span class="c1"></span><span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
+<pre><code class="chroma language-go"><span class="c1">// HelloWorld prints &#34;Hello World&#34;</span>
+<span class="kd">func</span> <span class="nf">HelloWorld</span><span class="p">()</span> <span class="p">{</span>
 <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>
 <span class="p">}</span></code></pre>
 </div>`)

modules/git/remote.go

@@ -6,6 +6,7 @@ package repository
 import (
 "context"
 "fmt"
+"strings"
 
 "code.gitea.io/gitea/models/db"
 git_model "code.gitea.io/gitea/models/git"
@@ -51,6 +52,9 @@ func SyncRepoBranchesWithRepo(ctx context.Context, repo *repo_model.Repository,
 {
 branches, _, err := gitRepo.GetBranchNames(0, 0)
 if err != nil {
+if strings.Contains(err.Error(), "ref file is empty") {
+return 0, nil
+}
 return 0, err
 }
 log.Trace("SyncRepoBranches[%s]: branches[%d]: %v", repo.FullName(), len(branches), branches)

modules/markup/orgmode/orgmode_test.go

@@ -41,7 +41,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
 repoPath := m.GetRepository(ctx).RepoPath()
 // Remove old remote
 _, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: repoPath})
-if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return err
 }
 
@@ -52,7 +52,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
 cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, addr, repoPath))
 }
 _, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath})
-if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return err
 }
 
@@ -61,7 +61,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
 wikiRemotePath := repo_module.WikiRemoteURL(ctx, addr)
 // Remove old remote of wiki
 _, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: wikiPath})
-if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return err
 }
 
@@ -72,7 +72,7 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
 cmd.SetDescription(fmt.Sprintf("remote add %s --mirror=fetch %s [repo_path: %s]", remoteName, wikiRemotePath, wikiPath))
 }
 _, _, err = cmd.RunStdString(&git.RunOpts{Dir: wikiPath})
-if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return err
 }
 }

modules/repository/branch.go

@@ -8,7 +8,6 @@ import (
 "errors"
 "fmt"
 "net/http"
-"strings"
 "time"
 
 "code.gitea.io/gitea/models/db"
@@ -255,10 +254,10 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
 func cleanUpMigrateGitConfig(ctx context.Context, repoPath string) error {
 cmd := git.NewCommand(ctx, "remote", "rm", "origin")
 // if the origin does not exist
-_, stderr, err := cmd.RunStdString(&git.RunOpts{
+_, _, err := cmd.RunStdString(&git.RunOpts{
 Dir: repoPath,
 })
-if err != nil && !strings.HasPrefix(stderr, "fatal: No such remote") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return err
 }
 return nil
@@ -277,7 +276,7 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo
 }
 
 _, _, err := git.NewCommand(ctx, "remote", "rm", "origin").RunStdString(&git.RunOpts{Dir: repoPath})
-if err != nil && !strings.HasPrefix(err.Error(), "exit status 128 - fatal: No such remote ") {
+if err != nil && !git.IsRemoteNotExistError(err) {
 return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err)
 }
 

services/mirror/mirror_pull.go

@@ -40,7 +40,7 @@ export function parseIssueHref(href: string): IssuePathInfo {
 export function parseIssueNewHref(href: string): IssuePathInfo {
  const path = (href || '').replace(/[#?].*$/, '');
  const [_, ownerName, repoName, pathTypeField] = /([^/]+)\/([^/]+)\/(issues\/new|compare\/.+\.\.\.)/.exec(path) || [];
- const pathType = pathTypeField.startsWith('issues/new') ? 'issues' : 'pulls';
+ const pathType = pathTypeField ? (pathTypeField.startsWith('issues/new') ? 'issues' : 'pulls') : undefined;
  return {ownerName, repoName, pathType};
 }