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 /modules/git/blame.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 'modules/git/blame.go')
| -rw-r--r-- | modules/git/blame.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/git/blame.go b/modules/git/blame.go index 548236b657..4f4343fe96 100644 --- a/modules/git/blame.go +++ b/modules/git/blame.go @@ -87,10 +87,11 @@ func (r *BlameReader) Close() error { // CreateBlameReader creates reader for given repository, commit and file func CreateBlameReader(repoPath, commitID, file string) (*BlameReader, error) { - _, err := OpenRepository(repoPath) + gitRepo, err := OpenRepository(repoPath) if err != nil { return nil, err } + gitRepo.Close() return createBlameReader(repoPath, GitExecutable, "blame", commitID, "--porcelain", "--", file) } |