fix: pathspec prefixes still allows directory collapsing.

Author: Byron

gix-dir/src/walk/readdir.rs

@@ -210,7 +210,10 @@ impl Mark {
                 } else {
                     dir_info.disk_kind
                 },
-                pathspec_match: filter_dir_pathspec(dir_info.pathspec_match),
+                pathspec_match: ctx
+                    .pathspec
+                    .pattern_matching_relative_path(dir_rela_path, Some(true), ctx.pathspec_attributes)
+                    .map(|m| m.kind.into()),
                 ..dir_info
             };
             if opts.should_hold(empty_info.status) {

gix-dir/tests/fixtures/many.sh

@@ -201,7 +201,7 @@ mkdir untracked-and-ignored-for-collapse
   echo "ignored/" >> .gitignore
   echo "*.o" >> .gitignore
 
-  mkdir untracked ignored mixed ignored-inside
+  mkdir -p untracked ignored/empty mixed ignored-inside
   touch untracked/a ignored/b mixed/c mixed/c.o ignored-inside/d.o
 )
 

gix-dir/tests/walk/mod.rs

@@ -168,6 +168,80 @@ fn complex_empty() -> crate::Result {
     Ok(())
 }
 
+#[test]
+fn ignored_with_prefix_pathspec_collapses_just_like_untracked() -> crate::Result {
+    let root = fixture("untracked-and-ignored-for-collapse");
+    let ((out, _root), entries) = collect_filtered(
+        &root,
+        None,
+        |keep, ctx| {
+            walk(
+                &root,
+                ctx,
+                walk::Options {
+                    for_deletion: Some(Default::default()),
+                    emit_untracked: CollapseDirectory,
+                    emit_ignored: Some(CollapseDirectory),
+                    ..options()
+                },
+                keep,
+            )
+        },
+        ["untracked", "no-match"],
+    );
+
+    assert_eq!(
+        out,
+        walk::Outcome {
+            read_dir_calls: 2,
+            returned_entries: entries.len(),
+            seen_entries: 6,
+        }
+    );
+    assert_eq!(
+        entries,
+        [entryps("untracked", Untracked, Directory, Prefix)],
+        "prefix matches allow untracked directories to collapse"
+    );
+
+    let ((out, _root), entries) = collect_filtered(
+        &root,
+        None,
+        |keep, ctx| {
+            walk(
+                &root,
+                ctx,
+                walk::Options {
+                    for_deletion: Some(Default::default()),
+                    emit_untracked: CollapseDirectory,
+                    emit_ignored: Some(CollapseDirectory),
+                    ..options()
+                },
+                keep,
+            )
+        },
+        ["ignored", "ignored-inside"],
+    );
+
+    assert_eq!(
+        out,
+        walk::Outcome {
+            read_dir_calls: 4,
+            returned_entries: entries.len(),
+            seen_entries: 8,
+        }
+    );
+    assert_eq!(
+        entries,
+        [
+            entryps("ignored", Ignored(Expendable), Directory, Prefix),
+            entryps("ignored-inside", Ignored(Expendable), Directory, Prefix)
+        ],
+        "prefix matches allow ignored directories to collapse as well"
+    );
+    Ok(())
+}
+
 #[test]
 fn only_untracked_with_cwd_handling() -> crate::Result {
     let root = fixture("only-untracked");