aboutsummaryrefslogtreecommitdiffstats
path: root/worktree_test.go
diff options
context:
space:
mode:
authorJohn Pastore <cbbm142@users.noreply.github.com>2023-03-21 09:15:32 -0400
committerJohn Pastore <cbbm142@users.noreply.github.com>2023-05-01 20:02:58 -0400
commitcf51e2febf37332f11ae63feca768d9672e10a36 (patch)
tree29d29ca56d5b85b68f64bc88476e7876fa291be3 /worktree_test.go
parent3f1cfde283c93f33218c807602e93d47f72f7b90 (diff)
downloadgo-git-cf51e2febf37332f11ae63feca768d9672e10a36.tar.gz
Worktree: Status, add check to see if file already checked in [Fixes 718]
Checks if an ignored file was previously checked in. If it was, then the file is not ignored matching native git behavior.
Diffstat (limited to 'worktree_test.go')
-rw-r--r--worktree_test.go45
1 files changed, 45 insertions, 0 deletions
diff --git a/worktree_test.go b/worktree_test.go
index ac56a46..294b7ed 100644
--- a/worktree_test.go
+++ b/worktree_test.go
@@ -871,6 +871,51 @@ func (s *WorktreeSuite) TestStatusEmpty(c *C) {
c.Assert(status, NotNil)
}
+func (s *WorktreeSuite) TestStatusCheckedInBeforeIgnored(c *C) {
+ fs := memfs.New()
+ storage := memory.NewStorage()
+
+ r, err := Init(storage, fs)
+ c.Assert(err, IsNil)
+
+ w, err := r.Worktree()
+ c.Assert(err, IsNil)
+
+ err = util.WriteFile(fs, "fileToIgnore", []byte("Initial data"), 0755)
+ c.Assert(err, IsNil)
+ _, err = w.Add("fileToIgnore")
+ c.Assert(err, IsNil)
+ _, err = w.Commit("Added file that will be ignored later", &CommitOptions{})
+ 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", &CommitOptions{})
+ c.Assert(err, IsNil)
+ status, err := w.Status()
+ c.Assert(err, IsNil)
+ c.Assert(status.IsClean(), Equals, true)
+ c.Assert(status, NotNil)
+
+ err = util.WriteFile(fs, "secondIgnoredFile", []byte("Should be completly ignored"), 0755)
+ c.Assert(err, IsNil)
+ status = nil
+ status, err = w.Status()
+ c.Assert(err, IsNil)
+ c.Assert(status.IsClean(), Equals, true)
+ c.Assert(status, NotNil)
+
+ err = util.WriteFile(fs, "fileToIgnore", []byte("Updated data"), 0755)
+ c.Assert(err, IsNil)
+ status = nil
+ status, err = w.Status()
+ c.Assert(err, IsNil)
+ c.Assert(status.IsClean(), Equals, false)
+ c.Assert(status, NotNil)
+}
+
func (s *WorktreeSuite) TestStatusEmptyDirty(c *C) {
fs := memfs.New()
err := util.WriteFile(fs, "foo", []byte("foo"), 0755)