Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database

2 files changed, 8 insertions, 8 deletions

diff --git a/models/repo.go b/models/repo.go
index dfd07f1982..be9e3fd753 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -654,12 +654,7 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 		return repo, UpdateRepository(repo, false)
 	}
 
-	repo, err = CleanUpMigrateInfo(repo, repoPath)
-	if err != nil {
-		return repo, err
-	}
-
-	return repo, UpdateRepository(repo, false)
+	return CleanUpMigrateInfo(repo, repoPath)
 }
 
 // Finish migrating repository with things that don't need to be done for mirrors.
@@ -705,7 +700,7 @@ func CleanUpMigrateInfo(repo *Repository, repoPath string) (*Repository, error)
 		repo.DefaultBranch = headBranch.Name
 	}
 
-	return repo, nil
+	return repo, UpdateRepository(repo, false)
 }
 
 // initRepoCommit temporarily changes with work directory.
@@ -1622,6 +1617,11 @@ func MirrorUpdate() {
 	}
 }
 
+func DeleteMirrorByRepoID(repoId int64) error {
+	_, err := x.Delete(&Mirror{RepoID: repoId})
+	return err
+}
+
 // GitFsck calls 'git fsck' to check repository health.
 func GitFsck() {
 	if taskStatusPool.IsRunning(_GIT_FSCK) {
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index cb541fc98e..3712a088b0 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -165,7 +165,7 @@ func SettingsPost(ctx *middleware.Context, form auth.RepoSettingForm) {
 			return
 		}
 
-		if err := models.UpdateRepository(repo, false); err != nil {
+		if err := models.DeleteMirrorByRepoID(ctx.Repo.Repository.ID); err != nil {
 			ctx.RenderWithErr(ctx.Tr("settings.convert.failed"), SETTINGS_OPTIONS, &form)
 			return
 		}