aboutsummaryrefslogtreecommitdiffstats
path: root/repository
diff options
context:
space:
mode:
authorMichael Muré <batolettre@gmail.com>2020-09-26 14:05:11 +0200
committerMichael Muré <batolettre@gmail.com>2020-09-29 20:42:21 +0200
commitcdfbecf3e2b874f0b9dd99b75bcb80aa5be8b4b4 (patch)
tree40316000e9903bcc92249f4b542f2cae50882a74 /repository
parentfb9170e2590531fddb5c2e0059dac5ac4bb64013 (diff)
downloadgit-bug-cdfbecf3e2b874f0b9dd99b75bcb80aa5be8b4b4.tar.gz
repo: fix gogit clock path
Diffstat (limited to 'repository')
-rw-r--r--repository/gogit.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/repository/gogit.go b/repository/gogit.go
index a93e8576..b0a4672b 100644
--- a/repository/gogit.go
+++ b/repository/gogit.go
@@ -507,7 +507,7 @@ func (repo *GoGitRepo) GetOrCreateClock(name string) (lamport.Clock, error) {
repo.clocksMutex.Lock()
defer repo.clocksMutex.Unlock()
- p := clockPath + name + "-clock"
+ p := stdpath.Join(repo.path, clockPath, name+"-clock")
c, err = lamport.NewPersistedClock(p)
if err != nil {
@@ -526,7 +526,7 @@ func (repo *GoGitRepo) getClock(name string) (lamport.Clock, error) {
return c, nil
}
- p := clockPath + name + "-clock"
+ p := stdpath.Join(repo.path, clockPath, name+"-clock")
c, err := lamport.LoadPersistedClock(p)
if err == nil {