diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-02-22 11:57:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 11:57:41 +0800 |
| commit | e79dae29cc2fcabc639ff27f28a9adf1fa07b28c (patch) | |
| tree | e801e6e3a7a0f3fdc2e76ea94e1dfbc5912494b1 /modules/migrations/dump.go | |
| parent | cd8b2f32738f4d1dfe23f698d5ce279b571567dd (diff) | |
| download | gitea-e79dae29cc2fcabc639ff27f28a9adf1fa07b28c.tar.gz gitea-e79dae29cc2fcabc639ff27f28a9adf1fa07b28c.zip | |
Fix repo-restore bug with poster not replaced (#14759)
* Fix restore bug
* Fix restore bug
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'modules/migrations/dump.go')
| -rw-r--r-- | modules/migrations/dump.go | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/modules/migrations/dump.go b/modules/migrations/dump.go index 3c3b9a1753..297095883b 100644 --- a/modules/migrations/dump.go +++ b/modules/migrations/dump.go @@ -12,6 +12,7 @@ import ( "net/url" "os" "path/filepath" + "strconv" "time" "code.gitea.io/gitea/models" @@ -19,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/repository" + "code.gitea.io/gitea/modules/structs" "gopkg.in/yaml.v2" ) @@ -572,20 +574,27 @@ func RestoreRepository(ctx context.Context, baseDir string, ownerName, repoName if err != nil { return err } + opts, err := downloader.getRepoOptions() + if err != nil { + return err + } + tp, _ := strconv.Atoi(opts["service_type"]) + if err = migrateRepository(downloader, uploader, base.MigrateOptions{ - Wiki: true, - Issues: true, - Milestones: true, - Labels: true, - Releases: true, - Comments: true, - PullRequests: true, - ReleaseAssets: true, + Wiki: true, + Issues: true, + Milestones: true, + Labels: true, + Releases: true, + Comments: true, + PullRequests: true, + ReleaseAssets: true, + GitServiceType: structs.GitServiceType(tp), }); err != nil { if err1 := uploader.Rollback(); err1 != nil { log.Error("rollback failed: %v", err1) } return err } - return nil + return updateMigrationPosterIDByGitService(ctx, structs.GitServiceType(tp)) } |