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_commit_test.go | |
| parent | bf3a92052f715c507ace0cb9f2b7fb358f623abc (diff) | |
| download | go-git-abb9ec0f3efea571b7f19b7391eb7c152c899f45.tar.gz | |
*: upgrade to go-billy.v3, merge
Diffstat (limited to 'worktree_commit_test.go')
| -rw-r--r-- | worktree_commit_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/worktree_commit_test.go b/worktree_commit_test.go index 7e1b93c..8f3b7b0 100644 --- a/worktree_commit_test.go +++ b/worktree_commit_test.go @@ -9,8 +9,8 @@ import ( "gopkg.in/src-d/go-git.v4/storage/memory" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v2" - "gopkg.in/src-d/go-billy.v2/memfs" + "gopkg.in/src-d/go-billy.v3/memfs" + "gopkg.in/src-d/go-billy.v3/util" ) func (s *WorktreeSuite) TestCommitInvalidOptions(c *C) { @@ -37,7 +37,7 @@ func (s *WorktreeSuite) TestCommitInitial(c *C) { w, err := r.Worktree() c.Assert(err, IsNil) - billy.WriteFile(fs, "foo", []byte("foo"), 0644) + util.WriteFile(fs, "foo", []byte("foo"), 0644) _, err = w.Add("foo") c.Assert(err, IsNil) @@ -61,7 +61,7 @@ func (s *WorktreeSuite) TestCommitParent(c *C) { err := w.Checkout(&CheckoutOptions{}) c.Assert(err, IsNil) - billy.WriteFile(fs, "foo", []byte("foo"), 0644) + util.WriteFile(fs, "foo", []byte("foo"), 0644) _, err = w.Add("foo") c.Assert(err, IsNil) @@ -85,8 +85,8 @@ func (s *WorktreeSuite) TestCommitAll(c *C) { err := w.Checkout(&CheckoutOptions{}) c.Assert(err, IsNil) - billy.WriteFile(fs, "LICENSE", []byte("foo"), 0644) - billy.WriteFile(fs, "foo", []byte("foo"), 0644) + util.WriteFile(fs, "LICENSE", []byte("foo"), 0644) + util.WriteFile(fs, "foo", []byte("foo"), 0644) hash, err := w.Commit("foo\n", &CommitOptions{ All: true, |