git: worktree, Fix tests affected by changed Commit method.

1 files changed, 18 insertions, 11 deletions

diff --git a/worktree_test.go b/worktree_test.go
index 668c30a..24a402c 100644
--- a/worktree_test.go
+++ b/worktree_test.go
@@ -33,9 +33,11 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-var (
-	defaultTestCommitOptions = &CommitOptions{Author: &object.Signature{Name: "testuser", Email: "testemail"}}
-)
+func defaultTestCommitOptions() *CommitOptions {
+	return &CommitOptions{
+		Author: &object.Signature{Name: "testuser", Email: "testemail"},
+	}
+}
 
 type WorktreeSuite struct {
 	BaseSuite
@@ -88,8 +90,9 @@ func (s *WorktreeSuite) TestPullFastForward(c *C) {
 
 	w, err := server.Worktree()
 	c.Assert(err, IsNil)
-	err = os.WriteFile(filepath.Join(path, "foo"), []byte("foo"), 0755)
+	err = os.WriteFile(filepath.Join(url, "foo"), []byte("foo"), 0755)
 	c.Assert(err, IsNil)
+	w.Add("foo")
 	hash, err := w.Commit("foo", &CommitOptions{Author: defaultSignature()})
 	c.Assert(err, IsNil)
 
@@ -125,15 +128,17 @@ func (s *WorktreeSuite) TestPullNonFastForward(c *C) {
 
 	w, err := server.Worktree()
 	c.Assert(err, IsNil)
-	err = os.WriteFile(filepath.Join(path, "foo"), []byte("foo"), 0755)
+	err = os.WriteFile(filepath.Join(url, "foo"), []byte("foo"), 0755)
 	c.Assert(err, IsNil)
+	w.Add("foo")
 	_, err = w.Commit("foo", &CommitOptions{Author: defaultSignature()})
 	c.Assert(err, IsNil)
 
 	w, err = r.Worktree()
 	c.Assert(err, IsNil)
-	err = os.WriteFile(filepath.Join(path, "bar"), []byte("bar"), 0755)
+	err = os.WriteFile(filepath.Join(dir, "bar"), []byte("bar"), 0755)
 	c.Assert(err, IsNil)
+	w.Add("bar")
 	_, err = w.Commit("bar", &CommitOptions{Author: defaultSignature()})
 	c.Assert(err, IsNil)
 
@@ -286,7 +291,8 @@ func (s *RepositorySuite) TestPullAdd(c *C) {
 func (s *WorktreeSuite) TestPullAlreadyUptodate(c *C) {
 	path := fixtures.Basic().ByTag("worktree").One().Worktree().Root()
 
-	r, err := Clone(memory.NewStorage(), memfs.New(), &CloneOptions{
+	fs := memfs.New()
+	r, err := Clone(memory.NewStorage(), fs, &CloneOptions{
 		URL: filepath.Join(path, ".git"),
 	})
 
@@ -294,8 +300,9 @@ func (s *WorktreeSuite) TestPullAlreadyUptodate(c *C) {
 
 	w, err := r.Worktree()
 	c.Assert(err, IsNil)
-	err = os.WriteFile(filepath.Join(path, "bar"), []byte("bar"), 0755)
+	err = util.WriteFile(fs, "bar", []byte("bar"), 0755)
 	c.Assert(err, IsNil)
+	w.Add("bar")
 	_, err = w.Commit("bar", &CommitOptions{Author: defaultSignature()})
 	c.Assert(err, IsNil)
 
@@ -1002,14 +1009,14 @@ func (s *WorktreeSuite) TestStatusCheckedInBeforeIgnored(c *C) {
 	_, err = w.Add("fileToIgnore")
 	c.Assert(err, IsNil)
 
-	_, err = w.Commit("Added file that will be ignored later", defaultTestCommitOptions)
+	_, err = w.Commit("Added file that will be ignored later", defaultTestCommitOptions())
 	c.Assert(err, IsNil)
 
 	err = util.WriteFile(fs, ".gitignore", []byte("fileToIgnore\nsecondIgnoredFile"), 0755)
 	c.Assert(err, IsNil)
 	_, err = w.Add(".gitignore")
 	c.Assert(err, IsNil)
-	_, err = w.Commit("Added .gitignore", defaultTestCommitOptions)
+	_, err = w.Commit("Added .gitignore", defaultTestCommitOptions())
 	c.Assert(err, IsNil)
 	status, err := w.Status()
 	c.Assert(err, IsNil)
@@ -2056,7 +2063,7 @@ func (s *WorktreeSuite) TestAddSkipStatusWithIgnoredPath(c *C) {
 	c.Assert(err, IsNil)
 	_, err = w.Add(".gitignore")
 	c.Assert(err, IsNil)
-	_, err = w.Commit("Added .gitignore", defaultTestCommitOptions)
+	_, err = w.Commit("Added .gitignore", defaultTestCommitOptions())
 	c.Assert(err, IsNil)
 
 	err = util.WriteFile(fs, "fileToIgnore", []byte("file to ignore"), 0644)