mirror of
https://github.com/go-gitea/gitea
synced 2024-11-19 00:11:24 +01:00
Fix potential copy lfs records failure when fork a repository (#15441)
This commit is contained in:
parent
cf8f66e5dc
commit
dc5a1d617d
1 changed files with 7 additions and 6 deletions
|
@ -64,6 +64,12 @@ func ForkRepository(doer, owner *models.User, oldRepo *models.Repository, name,
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// copy lfs files failure should not be ignored
|
||||||
|
if err := models.CopyLFS(ctx, repo, oldRepo); err != nil {
|
||||||
|
rollbackRemoveFn()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
repoPath := models.RepoPath(owner.Name, repo.Name)
|
repoPath := models.RepoPath(owner.Name, repo.Name)
|
||||||
if stdout, err := git.NewCommand(
|
if stdout, err := git.NewCommand(
|
||||||
"clone", "--bare", oldRepoPath, repoPath).
|
"clone", "--bare", oldRepoPath, repoPath).
|
||||||
|
@ -92,6 +98,7 @@ func ForkRepository(doer, owner *models.User, oldRepo *models.Repository, name,
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// even if below operations failed, it could be ignored. And they will be retried
|
||||||
ctx := models.DefaultDBContext()
|
ctx := models.DefaultDBContext()
|
||||||
if err = repo.UpdateSize(ctx); err != nil {
|
if err = repo.UpdateSize(ctx); err != nil {
|
||||||
log.Error("Failed to update size for repository: %v", err)
|
log.Error("Failed to update size for repository: %v", err)
|
||||||
|
@ -100,11 +107,5 @@ func ForkRepository(doer, owner *models.User, oldRepo *models.Repository, name,
|
||||||
log.Error("Copy language stat from oldRepo failed")
|
log.Error("Copy language stat from oldRepo failed")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := models.CopyLFS(ctx, repo, oldRepo); err != nil {
|
|
||||||
if errDelete := models.DeleteRepository(doer, owner.ID, repo.ID); errDelete != nil {
|
|
||||||
log.Error("Rollback deleteRepository: %v", errDelete)
|
|
||||||
}
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return repo, nil
|
return repo, nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue