git: worktree, canonicalize pathnames when calling Worktree.Add(), Fixes #1460

0xDEC0DE · 0xDEC0DE · commit ad8a55254838 · 2025-04-20T13:57:52.000+10:00
Ensure that adding files off the filesystem root gets the filenames right. Fixes: Issue #1460
diff --git a/worktree_status.go b/worktree_status.go
@@ -370,7 +370,13 @@ func (w *Worktree) doAdd(path string, ignorePattern []gitignore.Pattern, skipSta
 		}
 	}
 
+	// Relative paths only; see: https://github.com/go-git/go-git/issues/1460
+	// filepath.IsAbs is hilariously bugged on Windows, check by hand
 	path = filepath.Clean(path)
+	if string(path[0]) == string(filepath.Separator) {
+		root := w.Filesystem.Root()
+		path, _ = filepath.Rel(root, filepath.Join(root, ".", path))
+	}
 
 	if err != nil || !fi.IsDir() {
 		added, h, err = w.doAddFile(idx, s, path, ignorePattern)
diff --git a/worktree_test.go b/worktree_test.go
@@ -1529,7 +1529,7 @@ func (s *WorktreeSuite) TestAddUntracked() {
 	err = util.WriteFile(w.Filesystem, "foo", []byte("FOO"), 0755)
 	s.NoError(err)
 
-	hash, err := w.Add("foo")
+	hash, err := w.Add("/foo")
 	s.Equal("d96c7efbfec2814ae0301ad054dc8d9fc416c9b5", hash.String())
 	s.NoError(err)
 

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,13 @@ func (w *Worktree) doAdd(path string, ignorePattern []gitignore.Pattern, skipSta`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
	`373`	`+ // Relative paths only; see: https://github.com/go-git/go-git/issues/1460`
	`374`	`+ // filepath.IsAbs is hilariously bugged on Windows, check by hand`
`373`	`375`	`path = filepath.Clean(path)`
	`376`	`+ if string(path[0]) == string(filepath.Separator) {`
	`377`	`+ root := w.Filesystem.Root()`
	`378`	`+ path, _ = filepath.Rel(root, filepath.Join(root, ".", path))`
	`379`	`+ }`
`374`	`380`
`375`	`381`	`if err != nil \|\| !fi.IsDir() {`
`376`	`382`	`added, h, err = w.doAddFile(idx, s, path, ignorePattern)`