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

release/v1.6
Lunny Xiao 6 years ago committed by GitHub
parent e28801ff1a
commit 79464216d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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".

Loading…
Cancel
Save