aboutsummaryrefslogtreecommitdiffstats
path: root/worktree.go
diff options
context:
space:
mode:
Diffstat (limited to 'worktree.go')
-rw-r--r--worktree.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/worktree.go b/worktree.go
index ad6e0f7..aa30b83 100644
--- a/worktree.go
+++ b/worktree.go
@@ -8,6 +8,7 @@ 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"
@@ -15,7 +16,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/object"
"gopkg.in/src-d/go-git.v4/utils/merkletrie"
- "gopkg.in/src-d/go-billy.v2"
+ "gopkg.in/src-d/go-billy.v3"
)
var (
@@ -486,7 +487,7 @@ func (w *Worktree) readGitmodulesFile() (*config.Modules, error) {
}
func rmFileAndDirIfEmpty(fs billy.Filesystem, name string) error {
- if err := billy.RemoveAll(fs, name); err != nil {
+ if err := util.RemoveAll(fs, name); err != nil {
return err
}