fix data race on migrate repository (#5224) (#5230)

go-gitea · Oct 31, 2018 · 7946421 · 7946421
1 parent e28801f
commit 7946421
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/models/repo.go b/models/repo.go
@@ -1035,7 +1035,6 @@ func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, err
 		if err = SyncReleasesWithTags(repo, gitRepo); err != nil {
 			log.Error(4, "Failed to synchronize tags to releases for repository: %v", err)
 		}
-		UpdateRepoIndexer(repo)
 	}
 
 	if err = repo.UpdateSize(); err != nil {
@@ -1053,10 +1052,16 @@ func MigrateRepository(doer, u *User, opts MigrateRepoOptions) (*Repository, err
 		}
 
 		repo.IsMirror = true
-		return repo, UpdateRepository(repo, false)
+		err = UpdateRepository(repo, false)
+	} else {
+		repo, err = CleanUpMigrateInfo(repo)
+	}
+
+	if err != nil && !repo.IsBare {
+		UpdateRepoIndexer(repo)
 	}
 
-	return CleanUpMigrateInfo(repo)
+	return repo, err
 }
 
 // cleanUpMigrateGitConfig removes mirror info which prevents "push --all".