Skip to content

Commit 1f6af33

Browse files
committed
rename
1 parent 0310fb8 commit 1f6af33

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

modules/git/git.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ func InitFull(ctx context.Context) (err error) {
221221
return syncGitConfig()
222222
}
223223

224-
// RemoteNotExistPrefix returns the prefix of the error message when a remote does not exist.
224+
// IsRemoteNotExistError returns the prefix of the error message when a remote does not exist.
225225
// see: https://github.com/go-gitea/gitea/issues/32889#issuecomment-2571848216
226226
// Should not add sapce in the end, sometimes git will add a `:`.
227-
func RemoteNotExistPrefix() string {
227+
func IsRemoteNotExistError() string {
228228
if DefaultFeatures().NewExitStatusForRemoteNotExist {
229229
return "exit status 2 - error: No such remote"
230230
}

services/mirror/mirror_pull.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ 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(), git.RemoteNotExistPrefix()) {
44+
if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
4545
return err
4646
}
4747

4848
cmd := git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteName).AddArguments("--mirror=fetch").AddDynamicArguments(addr)
4949
_, _, err = cmd.RunStdString(&git.RunOpts{Dir: repoPath})
50-
if err != nil && !strings.HasPrefix(err.Error(), git.RemoteNotExistPrefix()) {
50+
if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
5151
return err
5252
}
5353

@@ -56,13 +56,13 @@ func UpdateAddress(ctx context.Context, m *repo_model.Mirror, addr string) error
5656
wikiRemotePath := repo_module.WikiRemoteURL(ctx, addr)
5757
// Remove old remote of wiki
5858
_, _, err = git.NewCommand(ctx, "remote", "rm").AddDynamicArguments(remoteName).RunStdString(&git.RunOpts{Dir: wikiPath})
59-
if err != nil && !strings.HasPrefix(err.Error(), git.RemoteNotExistPrefix()) {
59+
if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
6060
return err
6161
}
6262

6363
cmd = git.NewCommand(ctx, "remote", "add").AddDynamicArguments(remoteName).AddArguments("--mirror=fetch").AddDynamicArguments(wikiRemotePath)
6464
_, _, err = cmd.RunStdString(&git.RunOpts{Dir: wikiPath})
65-
if err != nil && !strings.HasPrefix(err.Error(), git.RemoteNotExistPrefix()) {
65+
if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
6666
return err
6767
}
6868
}

services/repository/migrate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func CleanUpMigrateInfo(ctx context.Context, repo *repo_model.Repository) (*repo
276276
}
277277

278278
_, _, err := git.NewCommand(ctx, "remote", "rm", "origin").RunStdString(&git.RunOpts{Dir: repoPath})
279-
if err != nil && !strings.HasPrefix(err.Error(), git.RemoteNotExistPrefix()) {
279+
if err != nil && !strings.HasPrefix(err.Error(), git.IsRemoteNotExistError()) {
280280
return repo, fmt.Errorf("CleanUpMigrateInfo: %w", err)
281281
}
282282

0 commit comments

Comments
 (0)