diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-02-02 13:08:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-02 13:08:52 +0100 |
| commit | d1b5bceb228e528bf085a3d4e2c35218e692da01 (patch) | |
| tree | 9dadb6130108cce350f546e4e30bc421c2b422a1 /storage/filesystem | |
| parent | a1f6ef44dfed1253ef7f3bc049f66b15f8fc2ab2 (diff) | |
| parent | 96317743391ac87aeb07d292469e212671628437 (diff) | |
| download | go-git-d1b5bceb228e528bf085a3d4e2c35218e692da01.tar.gz | |
Merge pull request #1006 from mcuadros/transactional-storage
storage: transactional, new storage with transactional capabilities
Diffstat (limited to 'storage/filesystem')
| -rw-r--r-- | storage/filesystem/dotgit/dotgit.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go index a58c248..ba9667e 100644 --- a/storage/filesystem/dotgit/dotgit.go +++ b/storage/filesystem/dotgit/dotgit.go @@ -14,6 +14,7 @@ import ( "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git.v4/plumbing" + "gopkg.in/src-d/go-git.v4/storage" "gopkg.in/src-d/go-git.v4/utils/ioutil" "gopkg.in/src-d/go-billy.v4" @@ -596,7 +597,7 @@ func (d *DotGit) checkReferenceAndTruncate(f billy.File, old *plumbing.Reference return err } if ref.Hash() != old.Hash() { - return fmt.Errorf("reference has changed concurrently") + return storage.ErrReferenceHasChanged } _, err = f.Seek(0, io.SeekStart) if err != nil { |