From 4b5b1bfcca97f8af201585dbbc8df0fe48c0985b Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Fri, 8 Dec 2023 11:33:20 -0800
Subject: [PATCH] Make abspath Split return an abspath

---
 abspath.go      |  6 +++---
 abspath_test.go |  2 +-
 main.go         | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/abspath.go b/abspath.go
index 793505b89..806a7afe9 100644
--- a/abspath.go
+++ b/abspath.go
@@ -60,7 +60,7 @@ func (abs absPath) Join(elems ...string) absPath {
 // Split breaks abs into stem and leaf parts (often directory and file, but not
 // necessarily), similar to filepath.Split.  Unlike filepath.Split, the
 // resulting stem part does not have any trailing path separators.
-func (abs absPath) Split() (string, string) {
+func (abs absPath) Split() (absPath, string) {
 	if abs == "" {
 		return "", ""
 	}
@@ -74,13 +74,13 @@ func (abs absPath) Split() (string, string) {
 		dir = string(os.PathSeparator)
 	}
 
-	return dir, base
+	return absPath(dir), base
 }
 
 // Dir returns the stem part of abs without the leaf, like filepath.Dir.
 func (abs absPath) Dir() string {
 	dir, _ := abs.Split()
-	return dir
+	return string(dir)
 }
 
 // Base returns the leaf part of abs without the stem, like filepath.Base.
diff --git a/abspath_test.go b/abspath_test.go
index 6136bc6a3..c857f6878 100644
--- a/abspath_test.go
+++ b/abspath_test.go
@@ -130,7 +130,7 @@ func TestAbsPathJoin(t *testing.T) {
 func TestAbsPathSplit(t *testing.T) {
 	testCases := []struct {
 		in      absPath
-		expDir  string
+		expDir  absPath
 		expBase string
 	}{{
 		in:      "",
diff --git a/main.go b/main.go
index 1c2f5a4b2..e653d4969 100644
--- a/main.go
+++ b/main.go
@@ -347,7 +347,7 @@ func main() {
 	}
 	log := func() *logging.Logger {
 		dir, file := makeAbsPath(*flErrorFile, absRoot).Split()
-		return logging.New(dir, file, *flVerbose)
+		return logging.New(dir.String(), file, *flVerbose)
 	}()
 	cmdRunner := cmd.NewRunner(log)
 
@@ -1273,25 +1273,25 @@ func (git *repoSync) publishSymlink(ctx context.Context, worktree worktree) erro
 	linkDir, linkFile := git.link.Split()
 
 	// Make sure the link directory exists.
-	if err := os.MkdirAll(linkDir, defaultDirMode); err != nil {
+	if err := os.MkdirAll(linkDir.String(), defaultDirMode); err != nil {
 		return fmt.Errorf("error making symlink dir: %w", err)
 	}
 
 	// linkDir is absolute, so we need to change it to a relative path.  This is
 	// so it can be volume-mounted at another path and the symlink still works.
-	targetRelative, err := filepath.Rel(linkDir, targetPath.String())
+	targetRelative, err := filepath.Rel(linkDir.String(), targetPath.String())
 	if err != nil {
 		return fmt.Errorf("error converting to relative path: %w", err)
 	}
 
 	const tmplink = "tmp-link"
 	git.log.V(2).Info("creating tmp symlink", "dir", linkDir, "link", tmplink, "target", targetRelative)
-	if err := os.Symlink(targetRelative, filepath.Join(linkDir, tmplink)); err != nil {
+	if err := os.Symlink(targetRelative, filepath.Join(linkDir.String(), tmplink)); err != nil {
 		return fmt.Errorf("error creating symlink: %w", err)
 	}
 
 	git.log.V(2).Info("renaming symlink", "root", linkDir, "oldName", tmplink, "newName", linkFile)
-	if err := os.Rename(filepath.Join(linkDir, tmplink), git.link.String()); err != nil {
+	if err := os.Rename(filepath.Join(linkDir.String(), tmplink), git.link.String()); err != nil {
 		return fmt.Errorf("error replacing symlink: %w", err)
 	}
 
@@ -1574,7 +1574,7 @@ func (git *repoSync) currentWorktree() (worktree, error) {
 		return worktree(target), nil
 	}
 	linkDir, _ := git.link.Split()
-	return worktree(absPath(linkDir).Join(target)), nil
+	return worktree(linkDir.Join(target)), nil
 }
 
 // SyncRepo syncs the repository to the desired ref, publishes it via the link,