Merge pull request #702 from ThinkChaos/perf/add-directory-minor-speedup

perf: minor speedup for `doAddDirectory`

1 files changed, 5 insertions, 21 deletions

diff --git a/worktree_status.go b/worktree_status.go
index a26c9e5..61bb6f7 100644
--- a/worktree_status.go
+++ b/worktree_status.go
@@ -281,8 +281,10 @@ func (w *Worktree) doAddDirectory(idx *index.Index, s Status, directory string,
 		}
 	}
 
+	directory = filepath.ToSlash(filepath.Clean(directory))
+
 	for name := range s {
-		if !isPathInDirectory(name, filepath.ToSlash(filepath.Clean(directory))) {
+		if !isPathInDirectory(name, directory) {
 			continue
 		}
 
@@ -292,32 +294,14 @@ func (w *Worktree) doAddDirectory(idx *index.Index, s Status, directory string,
 			return
 		}
 
-		if !added && a {
-			added = true
-		}
+		added = added || a
 	}
 
 	return
 }
 
 func isPathInDirectory(path, directory string) bool {
-	ps := strings.Split(path, "/")
-	ds := strings.Split(directory, "/")
-
-	if len(ds) == 1 && ds[0] == "." {
-		return true
-	}
-
-	if len(ps) < len(ds) {
-		return false
-	}
-
-	for i := 0; i < len(ds); i++ {
-		if ps[i] != ds[i] {
-			return false
-		}
-	}
-	return true
+	return directory == "." || strings.HasPrefix(path, directory+"/")
 }
 
 // AddWithOptions file contents to the index,  updates the index using the