diff options
author | yp05327 <576951401@qq.com> | 2025-01-07 13:42:45 +0100 |
---|---|---|
committer | Earl Warren <contact@earl-warren.org> | 2025-01-12 08:52:51 +0100 |
commit | f809052193dd974b088de56a963ae44a1b8fc3f9 (patch) | |
tree | 6a8ede292adcdf332e61e3c6ff8fc354605cfb07 /modules | |
parent | Update x/tools (forgejo) (#6537) (diff) | |
download | forgejo-f809052193dd974b088de56a963ae44a1b8fc3f9.tar.xz forgejo-f809052193dd974b088de56a963ae44a1b8fc3f9.zip |
Support the new exit code for `git remote` subcommands for git version >=2.30.0 (#33129)
Fix #32889
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 0d7d2ed39d0c0435cdc6403ee7764850154dca5a)
Conflicts:
modules/git/remote.go
trivial context conflict
Diffstat (limited to 'modules')
-rw-r--r-- | modules/git/remote.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/modules/git/remote.go b/modules/git/remote.go index 3585313f6a..eea57dd8e0 100644 --- a/modules/git/remote.go +++ b/modules/git/remote.go @@ -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) +} |