aboutsummaryrefslogtreecommitdiffstats
path: root/worktree.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-11-24 09:49:05 +0100
committerGitHub <noreply@github.com>2017-11-24 09:49:05 +0100
commitbe7a64e40de9cf2b2590bf4b62b2f9169f5f9302 (patch)
tree239e82702d6448db8de5be6219c30422fdb4b387 /worktree.go
parentd9518b57cdc9701c0077d23db54558f496daea9f (diff)
parentcaa4dc4729e50e3a10ccd438d02d69fa20f9b766 (diff)
downloadgo-git-be7a64e40de9cf2b2590bf4b62b2f9169f5f9302.tar.gz
Merge pull request #655 from mcuadros/billy.v4
*: update to go-billy.v4 and go-git-fixtures.v3
Diffstat (limited to 'worktree.go')
-rw-r--r--worktree.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/worktree.go b/worktree.go
index d2630b7..8ababfa 100644
--- a/worktree.go
+++ b/worktree.go
@@ -9,7 +9,6 @@ import (
"os"
"path/filepath"
- "gopkg.in/src-d/go-billy.v3/util"
"gopkg.in/src-d/go-git.v4/config"
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/plumbing/filemode"
@@ -19,7 +18,8 @@ import (
"gopkg.in/src-d/go-git.v4/utils/ioutil"
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-billy.v3"
+ "gopkg.in/src-d/go-billy.v4"
+ "gopkg.in/src-d/go-billy.v4/util"
)
var (