Close the gitrepo when deleting the repository (#15876)

Signed-off-by: Andrew Thornton <art27@cantab.net>
go-gitea · May 14, 2021 · d0ea10b · d0ea10b
1 parent f6be429
commit d0ea10b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/modules/migrations/gitea_uploader.go b/modules/migrations/gitea_uploader.go
@@ -851,6 +851,7 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
 // Rollback when migrating failed, this will rollback all the changes.
 func (g *GiteaLocalUploader) Rollback() error {
 	if g.repo != nil && g.repo.ID > 0 {
+		g.gitRepo.Close()
 		if err := models.DeleteRepository(g.doer, g.repo.OwnerID, g.repo.ID); err != nil {
 			return err
 		}

diff --git a/routers/admin/repos.go b/routers/admin/repos.go
@@ -47,6 +47,10 @@ func DeleteRepo(ctx *context.Context) {
 		return
 	}
 
+	if ctx.Repo != nil && ctx.Repo.GitRepo != nil && ctx.Repo.Repository != nil && ctx.Repo.Repository.ID == repo.ID {
+		ctx.Repo.GitRepo.Close()
+	}
+
 	if err := repo_service.DeleteRepository(ctx.User, repo); err != nil {
 		ctx.ServerError("DeleteRepository", err)
 		return

diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -889,6 +889,10 @@ func Delete(ctx *context.APIContext) {
 		return
 	}
 
+	if ctx.Repo.GitRepo != nil {
+		ctx.Repo.GitRepo.Close()
+	}
+
 	if err := repo_service.DeleteRepository(ctx.User, repo); err != nil {
 		ctx.Error(http.StatusInternalServerError, "DeleteRepository", err)
 		return

diff --git a/routers/repo/setting.go b/routers/repo/setting.go
@@ -544,6 +544,11 @@ func SettingsPost(ctx *context.Context) {
 			return
 		}
 
+		// Close the gitrepository before doing this.
+		if ctx.Repo.GitRepo != nil {
+			ctx.Repo.GitRepo.Close()
+		}
+
 		if err := repo_service.DeleteRepository(ctx.User, ctx.Repo.Repository); err != nil {
 			ctx.ServerError("DeleteRepository", err)
 			return