1 files changed, 14 insertions, 19 deletions
diff --git a/worktree_status.go b/worktree_status.go
index c639f13..61bb6f7 100644
--- a/worktree_status.go
+++ b/worktree_status.go
@@ -169,7 +169,9 @@ func (w *Worktree) excludeIgnoredChanges(changes merkletrie.Changes) merkletrie.
 		if len(path) != 0 {
 			isDir := (len(ch.To) > 0 && ch.To.IsDir()) || (len(ch.From) > 0 && ch.From.IsDir())
 			if m.Match(path, isDir) {
-				continue
+				if len(ch.From) == 0 {
+					continue
+				}
 			}
 		}
 		res = append(res, ch)
@@ -270,10 +272,6 @@ func (w *Worktree) Add(path string) (plumbing.Hash, error) {
 }
 
 func (w *Worktree) doAddDirectory(idx *index.Index, s Status, directory string, ignorePattern []gitignore.Pattern) (added bool, err error) {
-	files, err := w.Filesystem.ReadDir(directory)
-	if err != nil {
-		return false, err
-	}
 	if len(ignorePattern) > 0 {
 		m := gitignore.NewMatcher(ignorePattern)
 		matchPath := strings.Split(directory, string(os.PathSeparator))
@@ -283,32 +281,29 @@ func (w *Worktree) doAddDirectory(idx *index.Index, s Status, directory string,
 		}
 	}
 
-	for _, file := range files {
-		name := path.Join(directory, file.Name())
+	directory = filepath.ToSlash(filepath.Clean(directory))
 
-		var a bool
-		if file.IsDir() {
-			if file.Name() == GitDirName {
-				// ignore special git directory
-				continue
-			}
-			a, err = w.doAddDirectory(idx, s, name, ignorePattern)
-		} else {
-			a, _, err = w.doAddFile(idx, s, name, ignorePattern)
+	for name := range s {
+		if !isPathInDirectory(name, directory) {
+			continue
 		}
 
+		var a bool
+		a, _, err = w.doAddFile(idx, s, name, ignorePattern)
 		if err != nil {
 			return
 		}
 
-		if !added && a {
-			added = true
-		}
+		added = added || a
 	}
 
 	return
 }
 
+func isPathInDirectory(path, directory string) bool {
+	return directory == "." || strings.HasPrefix(path, directory+"/")
+}
+
 // AddWithOptions file contents to the index,  updates the index using the
 // current content found in the working tree, to prepare the content staged for
 // the next commit.