Fix bug of migrated repository not index (#16991) (#16995)

6543 · lunny · web-flow · commit f8503b5fbf2a · 2021-09-08T22:32:54.000+01:00
Fix #16986, #16152 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
diff --git a/modules/task/migrate.go b/modules/task/migrate.go
@@ -92,7 +92,6 @@ func runMigrateTask(t *models.Task) (err error) {
 	}
 
 	opts.MigrateToRepoID = t.RepoID
-	var repo *models.Repository
 
 	ctx, cancel := context.WithCancel(graceful.GetManager().ShutdownContext())
 	defer cancel()
@@ -106,9 +105,9 @@ func runMigrateTask(t *models.Task) (err error) {
 		return
 	}
 
-	repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts)
+	t.Repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts)
 	if err == nil {
-		log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name)
+		log.Trace("Repository migrated [%d]: %s/%s", t.Repo.ID, t.Owner.Name, t.Repo.Name)
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ func runMigrateTask(t *models.Task) (err error) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`opts.MigrateToRepoID = t.RepoID`
`95`		`- var repo *models.Repository`
`96`	`95`
`97`	`96`	`ctx, cancel := context.WithCancel(graceful.GetManager().ShutdownContext())`
`98`	`97`	`defer cancel()`
`@@ -106,9 +105,9 @@ func runMigrateTask(t *models.Task) (err error) {`
`106`	`105`	`return`
`107`	`106`	`}`
`108`	`107`
`109`		`- repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts)`
	`108`	`+ t.Repo, err = migrations.MigrateRepository(ctx, t.Doer, t.Owner.Name, *opts)`
`110`	`109`	`if err == nil {`
`111`		`- log.Trace("Repository migrated [%d]: %s/%s", repo.ID, t.Owner.Name, repo.Name)`
	`110`	`+ log.Trace("Repository migrated [%d]: %s/%s", t.Repo.ID, t.Owner.Name, t.Repo.Name)`
`112`	`111`	`return`
`113`	`112`	`}`
`114`	`113`