fix: assure worktree-roots aren't pruned with pathspecs that are never meant for them.

Previously, when pathspecs were defined, the classification of the worktree-root
would also be using them. This means that depending on the pathspec, worktree-roots would
be pruned, which in turn makes it impossible to recurse into them.

Now pathspecs are disabled when classifying the worktree-root directory.

Author: Byron

gix-dir/src/walk/classify.rs

@@ -21,7 +21,13 @@ pub fn root(
     let mut path_buf = worktree_root.to_owned();
     // These initial values kick in if worktree_relative_root.is_empty();
     let file_kind = path_buf.symlink_metadata().map(|m| m.file_type().into()).ok();
-    let mut out = path(&mut path_buf, buf, 0, file_kind, || None, options, ctx)?;
+    let pathspec_orig = std::mem::replace(
+        ctx.pathspec,
+        gix_pathspec::Search::from_specs(None, None, "".as_ref()).expect("empty is valid"),
+    );
+    let res = path(&mut path_buf, buf, 0, file_kind, || None, options, ctx);
+    *ctx.pathspec = pathspec_orig;
+    let mut out = res?;
     let worktree_root_is_repository = out
         .disk_kind
         .map_or(false, |kind| matches!(kind, entry::Kind::Repository));
@@ -53,6 +59,9 @@ pub fn root(
         }
         last_length = Some(buf.len());
     }
+    if out.pathspec_match.is_none() {
+        out.pathspec_match = Some(PathspecMatch::Always);
+    }
     Ok((out, worktree_root_is_repository))
 }
 /// The product of [`path()`] calls.

gix-dir/src/walk/function.rs

@@ -67,7 +67,8 @@ pub fn walk(
         options,
         &mut ctx,
     )?;
-    if !can_recurse(
+
+    let can_recurse = can_recurse(
         buf.as_bstr(),
         if root == worktree_root && root_info.disk_kind == Some(entry::Kind::Symlink) && current.is_dir() {
             classify::Outcome {
@@ -80,7 +81,8 @@ pub fn walk(
         options.for_deletion,
         worktree_root_is_repository,
         delegate,
-    ) {
+    );
+    if !can_recurse {
         if buf.is_empty() && !root_info.disk_kind.map_or(false, |kind| kind.is_dir()) {
             return Err(Error::WorktreeRootIsFile { root: root.to_owned() });
         }

gix-dir/tests/walk/mod.rs

@@ -2732,7 +2732,7 @@ fn worktree_root_can_be_symlink() -> crate::Result {
 #[test]
 fn root_may_not_go_through_dot_git() -> crate::Result {
     let root = fixture("with-nested-dot-git");
-    for (dir, expected_pathspec) in [("", Some(Verbatim)), ("subdir", None)] {
+    for (dir, expected_pathspec) in [("", Verbatim), ("subdir", Always)] {
         let troot = root.join("dir").join(".git").join(dir);
         let ((out, _root), entries) = collect(&root, Some(&troot), |keep, ctx| {
             walk(&root, ctx, options_emit_all(), keep)
@@ -2747,12 +2747,10 @@ fn root_may_not_go_through_dot_git() -> crate::Result {
         );
         assert_eq!(
             entries,
-            [{
-                let mut e = entry("dir/.git", Pruned, Directory).with_property(DotGit);
-                e.0.pathspec_match = expected_pathspec;
-                e
-            }],
-            "no traversal happened as root passes though .git"
+            [entry("dir/.git", Pruned, Directory)
+                .with_property(DotGit)
+                .with_match(expected_pathspec)],
+            "{dir}: no traversal happened as root passes though .git"
         );
     }
     Ok(())
@@ -3167,7 +3165,7 @@ fn root_can_be_pruned_early_with_pathspec() -> crate::Result {
 
     assert_eq!(
         entries,
-        [entry_nomatch("dir", Pruned, Directory)],
+        [entry("dir", Pruned, Directory)],
         "the pathspec didn't match the root, early abort"
     );
     Ok(())
@@ -3929,7 +3927,7 @@ fn untracked_and_ignored_collapse_mix() {
 #[test]
 fn root_cannot_pass_through_case_altered_capital_dot_git_if_case_insensitive() -> crate::Result {
     let root = fixture("with-nested-capitalized-dot-git");
-    for (dir, expected_pathspec) in [("", Some(Verbatim)), ("subdir", None)] {
+    for (dir, expected_pathspec) in [("", Verbatim), ("subdir", Always)] {
         let troot = root.join("dir").join(".GIT").join(dir);
         let ((out, _root), entries) = collect(&root, Some(&troot), |keep, ctx| {
             walk(
@@ -3952,12 +3950,10 @@ fn root_cannot_pass_through_case_altered_capital_dot_git_if_case_insensitive() -
         );
         assert_eq!(
             entries,
-            [{
-                let mut e = entry("dir/.GIT", Pruned, Directory).with_property(DotGit);
-                e.0.pathspec_match = expected_pathspec;
-                e
-            }],
-            "no traversal happened as root passes though .git, it compares in a case-insensitive fashion"
+            [entry("dir/.GIT", Pruned, Directory)
+                .with_property(DotGit)
+                .with_match(expected_pathspec)],
+            "{dir}: no traversal happened as root passes though .git, it compares in a case-insensitive fashion"
         );
     }