diff options
author | zeripath <art27@cantab.net> | 2019-11-13 18:51:33 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-13 18:51:33 +0000 |
commit | fb5af37b3e1a29eff15281d76cada6ab3fb04974 (patch) | |
tree | 3653cbf7122ca7ddfe8612687295a940669a9c36 /modules/git/repo.go | |
parent | 2ef37522b6c8b1ae05f07755718751744162908a (diff) | |
download | gitea-fb5af37b3e1a29eff15281d76cada6ab3fb04974.tar.gz gitea-fb5af37b3e1a29eff15281d76cada6ab3fb04974.zip |
Add Close() method to gogitRepository (#8901) (#8958)
Backport #8901 - Adjusted slightly for 1.9
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/repo.go')
-rw-r--r-- | modules/git/repo.go | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/modules/git/repo.go b/modules/git/repo.go index 28e54a1bbc..7adc622fca 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -17,6 +17,7 @@ import ( "strings" "time" + gitealog "code.gitea.io/gitea/modules/log" "github.com/Unknwon/com" "gopkg.in/src-d/go-billy.v4/osfs" gogit "gopkg.in/src-d/go-git.v4" @@ -107,6 +108,21 @@ func OpenRepository(repoPath string) (*Repository, error) { }, nil } +// Close this repository, in particular close the underlying gogitStorage if this is not nil +func (repo *Repository) Close() { + if repo == nil || repo.gogitStorage == nil { + return + } + if err := repo.gogitStorage.Close(); err != nil { + gitealog.Error("Error closing storage: %v", err) + } +} + +// GoGitRepo gets the go-git repo representation +func (repo *Repository) GoGitRepo() *gogit.Repository { + return repo.gogitRepo +} + // IsEmpty Check if repository is empty. func (repo *Repository) IsEmpty() (bool, error) { var errbuf strings.Builder |