Fix panic when destination directory is /

twpayne · Jul 11, 2021 · 0b499d7 · 0b499d7
1 parent 0296e3c
commit 0b499d7
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/internal/chezmoi/path.go b/internal/chezmoi/path.go
@@ -77,13 +77,17 @@ func (p AbsPath) String() string {
 
 // TrimDirPrefix trims prefix from p.
 func (p AbsPath) TrimDirPrefix(dirPrefixAbsPath AbsPath) (RelPath, error) {
-	if !strings.HasPrefix(string(p), string(dirPrefixAbsPath+"/")) {
+	dirAbsPath := dirPrefixAbsPath
+	if dirAbsPath != "/" {
+		dirAbsPath += "/"
+	}
+	if !strings.HasPrefix(string(p), string(dirAbsPath)) {
 		return "", &errNotInAbsDir{
 			pathAbsPath: p,
 			dirAbsPath:  dirPrefixAbsPath,
 		}
 	}
-	return RelPath(p[len(dirPrefixAbsPath)+1:]), nil
+	return RelPath(p[len(dirAbsPath):]), nil
 }
 
 // Type implements github.com/spf13/pflag.Value.Type.