diff options
| author | zeripath <art27@cantab.net> | 2019-11-13 07:01:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-13 07:01:19 +0000 |
| commit | 722a7c902dd39bd3d4328345ca969220640774d7 (patch) | |
| tree | 7fb83b70fd9df55fd7d3a805adf38238d6a9bca8 /models/wiki.go | |
| parent | 7b97e045557788efee6803261cf612eaf975c6be (diff) | |
| download | gitea-722a7c902dd39bd3d4328345ca969220640774d7.tar.gz gitea-722a7c902dd39bd3d4328345ca969220640774d7.zip | |
Add Close() method to gogitRepository (#8901)
In investigating #7947 it has become clear that the storage component of go-git repositories needs closing.
This PR adds this Close function and adds the Close functions as necessary.
In TransferOwnership the ctx.Repo.GitRepo is closed if it is open to help prevent the risk of multiple open files.
Fixes #7947
Diffstat (limited to 'models/wiki.go')
| -rw-r--r-- | models/wiki.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/wiki.go b/models/wiki.go index 858fe1d6d0..8b63716afa 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -140,6 +140,7 @@ func (repo *Repository) updateWikiPage(doer *User, oldWikiName, newWikiName, con log.Error("Unable to open temporary repository: %s (%v)", basePath, err) return fmt.Errorf("Failed to open new temporary repository in: %s %v", basePath, err) } + defer gitRepo.Close() if hasMasterBranch { if err := gitRepo.ReadTreeToIndex("HEAD"); err != nil { @@ -283,6 +284,7 @@ func (repo *Repository) DeleteWikiPage(doer *User, wikiName string) (err error) log.Error("Unable to open temporary repository: %s (%v)", basePath, err) return fmt.Errorf("Failed to open new temporary repository in: %s %v", basePath, err) } + defer gitRepo.Close() if err := gitRepo.ReadTreeToIndex("HEAD"); err != nil { log.Error("Unable to read HEAD tree to index in: %s %v", basePath, err) |