web/forgejo
10
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Support the new exit code for git remote subcommands for git version >=2.30.0 (#33129)

Browse source 
Fix #32889

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 0d7d2ed39d0c0435cdc6403ee7764850154dca5a)

Conflicts:
	modules/git/remote.go
  trivial context conflict
This commit is contained in:
yp05327 2025-01-07 21:42:45 +09:00 • committed by Earl Warren
parent 263b55fda8
commit f809052193
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/git/remote.go
View file

@ -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)
}