improve

Author: yp05327

modules/git/command.go

@@ -467,3 +467,14 @@ func AllowLFSFiltersArgs() TrustedCmdArgs {
 	}
 	return filteredLFSGlobalArgs[:j]
 }
+
+// IsRemoteNotExistError returns the prefix of the error message when a remote does not exist.
+// see: https://github.com/go-gitea/gitea/issues/32889#issuecomment-2571848216
+// Should not add sapce in the end, sometimes git will add a `:`.
+func IsRemoteNotExistError(err error) bool {
+	prefix := "exit status 128 - fatal: No such remote"
+	if DefaultFeatures().NewExitStatusForRemoteNotExist {
+		prefix = "exit status 2 - error: No such remote"
+	}
+	return strings.HasPrefix(err.Error(), prefix)
+}

modules/git/git.go

@@ -220,13 +220,3 @@ func InitFull(ctx context.Context) (err error) {
 
 	return syncGitConfig()
 }
-
-// IsRemoteNotExistError returns the prefix of the error message when a remote does not exist.
-// see: https://github.com/go-gitea/gitea/issues/32889#issuecomment-2571848216
-// Should not add sapce in the end, sometimes git will add a `:`.
-func IsRemoteNotExistError() string {
-	if DefaultFeatures().NewExitStatusForRemoteNotExist {
-		return "exit status 2 - error: No such remote"
-	}
-	return "exit status 128 - fatal: No such remote"
-}

services/mirror/mirror_pull.go

@@ -41,13 +41,13 @@ 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(), git.IsRemoteNotExistError()) {
+	if err != nil && !git.IsRemoteNotExistError(err) {
 		return err
 	}
 
 	cmd := git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteName).AddArguments("--mirror=fetch").AddDynamicArguments(addr)
 	_, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath})
-	if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
+	if err != nil && !git.IsRemoteNotExistError(err) {
 		return err
 	}
 
@@ -56,13 +56,13 @@ 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(), git.IsRemoteNotExistError()) {
+		if err != nil && !git.IsRemoteNotExistError(err) {
 			return err
 		}
 
 		cmd = git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteName).AddArguments("--mirror=fetch").AddDynamicArguments(wikiRemotePath)
 		_, _, err = cmd.RunStdString(&git.RunOpts{Dir: wikiPath})
-		if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
+		if err != nil && !git.IsRemoteNotExistError(err) {
 			return err
 		}
 	}

services/repository/migrate.go

@@ -276,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(), git.IsRemoteNotExistError()) {
+	if err != nil && !git.IsRemoteNotExistError(err) {
 		return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err)
 	}