MichaelMure/git-bug
1
1
Fork 0
mirror of https://github.com/MichaelMure/git-bug.git synced 2024-12-14 17:51:44 +03:00
Code Issues Projects Releases Wiki Activity

repo: workaround more go-git concurrency issue

Browse Source
This commit is contained in:
Michael Muré 2021-04-22 12:51:07 +02:00
parent c2a30a35fb
commit 7219753136
No known key found for this signature in database
GPG Key ID: A4457C029293126F
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
repository/gogit.go
View File

@ -518,6 +518,9 @@ func (repo *GoGitRepo) StoreTree(mapping []TreeEntry) (Hash, error) {
// ReadTree will return the list of entries in a Git tree // ReadTree will return the list of entries in a Git tree
func (repo *GoGitRepo) ReadTree(hash Hash) ([]TreeEntry, error) { func (repo *GoGitRepo) ReadTree(hash Hash) ([]TreeEntry, error) {
repo.rMutex.Lock()
defer repo.rMutex.Unlock()
h := plumbing.NewHash(hash.String()) h := plumbing.NewHash(hash.String())
// the given hash could be a tree or a commit // the given hash could be a tree or a commit
@ -630,6 +633,9 @@ func (repo *GoGitRepo) StoreSignedCommit(treeHash Hash, signKey *openpgp.Entity,
// GetTreeHash return the git tree hash referenced in a commit // GetTreeHash return the git tree hash referenced in a commit
func (repo *GoGitRepo) GetTreeHash(commit Hash) (Hash, error) { func (repo *GoGitRepo) GetTreeHash(commit Hash) (Hash, error) {
repo.rMutex.Lock()
defer repo.rMutex.Unlock()
obj, err := repo.r.CommitObject(plumbing.NewHash(commit.String())) obj, err := repo.r.CommitObject(plumbing.NewHash(commit.String()))
if err != nil { if err != nil {
return "", err return "", err
@ -640,6 +646,9 @@ func (repo *GoGitRepo) GetTreeHash(commit Hash) (Hash, error) {
// FindCommonAncestor will return the last common ancestor of two chain of commit // FindCommonAncestor will return the last common ancestor of two chain of commit
func (repo *GoGitRepo) FindCommonAncestor(commit1 Hash, commit2 Hash) (Hash, error) { func (repo *GoGitRepo) FindCommonAncestor(commit1 Hash, commit2 Hash) (Hash, error) {
repo.rMutex.Lock()
defer repo.rMutex.Unlock()
obj1, err := repo.r.CommitObject(plumbing.NewHash(commit1.String())) obj1, err := repo.r.CommitObject(plumbing.NewHash(commit1.String()))
if err != nil { if err != nil {
return "", err return "", err
@ -723,6 +732,9 @@ func (repo *GoGitRepo) ListCommits(ref string) ([]Hash, error) {
} }
func (repo *GoGitRepo) ReadCommit(hash Hash) (Commit, error) { func (repo *GoGitRepo) ReadCommit(hash Hash) (Commit, error) {
repo.rMutex.Lock()
defer repo.rMutex.Unlock()
commit, err := repo.r.CommitObject(plumbing.NewHash(hash.String())) commit, err := repo.r.CommitObject(plumbing.NewHash(hash.String()))
if err != nil { if err != nil {
return Commit{}, err return Commit{}, err