Merge pull request #1361 from BeChris/issue1176-v5

pjbgf · web-flow · commit 189e7e463f74 · 2025-01-15T20:14:31.000Z
git: worktree, fix restoring dot slash files (backported to v5). Fixes #1176
diff --git a/worktree.go b/worktree.go
@@ -425,8 +425,9 @@ func (w *Worktree) resetIndex(t *object.Tree, dirs []string, files []string) err
 }
 
 func inFiles(files []string, v string) bool {
+	v = filepath.Clean(v)
 	for _, s := range files {
-		if s == v {
+		if filepath.Clean(s) == v {
 			return true
 		}
 	}
diff --git a/worktree_test.go b/worktree_test.go
@@ -1253,7 +1253,7 @@ func (s *WorktreeSuite) TestResetHardSubFolders(c *C) {
 
 	err = fs.MkdirAll("dir", os.ModePerm)
 	c.Assert(err, IsNil)
-	tf, err := fs.Create("dir/testfile.txt")
+	tf, err := fs.Create("./dir/testfile.txt")
 	c.Assert(err, IsNil)
 	_, err = tf.Write([]byte("testfile content"))
 	c.Assert(err, IsNil)
@@ -3196,7 +3196,7 @@ func (s *WorktreeSuite) TestRestoreStaged(c *C) {
 	c.Assert(err, Equals, ErrNoRestorePaths)
 
 	// Restore Staged files in 2 groups and confirm status
-	opts.Files = []string{names[0], names[1]}
+	opts.Files = []string{names[0], "./" + names[1]}
 	err = w.Restore(&opts)
 	c.Assert(err, IsNil)
 	verifyStatus(c, "Restored First", w, names, []FileStatus{
@@ -3211,7 +3211,7 @@ func (s *WorktreeSuite) TestRestoreStaged(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(string(contents), Equals, "Foo Bar:11")
 
-	opts.Files = []string{names[2], names[3]}
+	opts.Files = []string{"./" + names[2], names[3]}
 	err = w.Restore(&opts)
 	c.Assert(err, IsNil)
 	verifyStatus(c, "Restored Second", w, names, []FileStatus{

Original file line number	Diff line number	Diff line change
`@@ -425,8 +425,9 @@ func (w Worktree) resetIndex(t object.Tree, dirs []string, files []string) err`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`func inFiles(files []string, v string) bool {`
	`428`	`+ v = filepath.Clean(v)`
`428`	`429`	`for _, s := range files {`
`429`		`- if s == v {`
	`430`	`+ if filepath.Clean(s) == v {`
`430`	`431`	`return true`
`431`	`432`	`}`
`432`	`433`	`}`