diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:15:40 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-06-18 12:15:40 +0200 |
| commit | abb9ec0f3efea571b7f19b7391eb7c152c899f45 (patch) | |
| tree | 703bcd8caf958007e90d6694e5225084b3ddfdb5 /worktree.go | |
| parent | bf3a92052f715c507ace0cb9f2b7fb358f623abc (diff) | |
| download | go-git-abb9ec0f3efea571b7f19b7391eb7c152c899f45.tar.gz | |
*: upgrade to go-billy.v3, merge
Diffstat (limited to 'worktree.go')
| -rw-r--r-- | worktree.go | 5 |
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 } |