fix: proper submodule handling

Previously it was possible for `.git` files in directories to
not trigger repository detection.

Author: Byron

gix-dir/src/walk/classify.rs

@@ -164,10 +164,6 @@ pub fn path(
                 m.kind.into()
             }
         });
-    if let Some(status) = maybe_status {
-        return Ok(out.with_status(status).with_kind(kind, index_kind));
-    }
-    debug_assert!(maybe_status.is_none(), "It only communicates a single stae right now");
 
     let mut maybe_upgrade_to_repository = |current_kind, find_harder: bool| {
         if recurse_repositories {
@@ -202,7 +198,14 @@ pub fn path(
             current_kind
         }
     };
+    if let Some(status) = maybe_status {
+        if kind == Some(entry::Kind::Directory) && index_kind == Some(entry::Kind::Repository) {
+            kind = maybe_upgrade_to_repository(kind, false);
+        }
+        return Ok(out.with_status(status).with_kind(kind, index_kind));
+    }
 
+    debug_assert!(maybe_status.is_none(), "It only communicates a single stae right now");
     if let Some(excluded) = ctx
         .excludes
         .as_mut()

gix-dir/tests/fixtures/generated-archives/.gitignore

@@ -1,3 +1,2 @@
-walk_baseline.tar.xz
 many.tar.xz
 many-symlinks.tar.xz

gix-dir/tests/fixtures/many.sh

@@ -318,3 +318,16 @@ cp -R type-mismatch-icase-clash-dir-is-file type-mismatch-icase-clash-file-is-di
 )
 mkdir empty
 touch just-a-file
+
+git init submodule
+(cd submodule
+  touch empty && git add empty
+  git commit -m upstream
+)
+
+git clone submodule multiple-submodules
+(cd multiple-submodules
+  git submodule add ../submodule submodule
+  git submodule add ../submodule a/b
+  git commit -m "add modules"
+)

gix-dir/tests/walk/mod.rs

@@ -2093,6 +2093,70 @@ fn root_can_be_pruned_early_with_pathspec() -> crate::Result {
     Ok(())
 }
 
+#[test]
+fn submodules() -> crate::Result {
+    let root = fixture("multiple-submodules");
+    let (out, entries) = collect(&root, |keep, ctx| walk(&root, &root, ctx, options_emit_all(), keep));
+    assert_eq!(
+        out,
+        walk::Outcome {
+            read_dir_calls: 2,
+            returned_entries: entries.len(),
+            seen_entries: 5,
+        }
+    );
+    let expected_content = [
+        entry_nokind(".git", DotGit),
+        entry(".gitmodules", Tracked, File).with_index_kind(File),
+        entry("a/b", Tracked, Repository).with_index_kind(Repository),
+        entry("empty", Tracked, File).with_index_kind(File),
+        entry("submodule", Tracked, Repository).with_index_kind(Repository),
+    ];
+    assert_eq!(entries, expected_content, "submodules are detected as repositories");
+
+    let (out1, entries) = try_collect_filtered_opts_collect(
+        &root,
+        |keep, ctx| walk(&root, &root, ctx, options_emit_all(), keep),
+        None::<&str>,
+        Options {
+            fresh_index: false,
+            ..Default::default()
+        },
+    )?;
+    assert_eq!(out1, out, "the output matches precisely");
+    assert_eq!(
+        entries, expected_content,
+        "this is also the case if the index isn't considered fresh"
+    );
+
+    let (out2, entries) = try_collect_filtered_opts_collect(
+        &root,
+        |keep, ctx| {
+            walk(
+                &root,
+                &root,
+                ctx,
+                walk::Options {
+                    ignore_case: true,
+                    ..options_emit_all()
+                },
+                keep,
+            )
+        },
+        None::<&str>,
+        Options {
+            fresh_index: false,
+            ..Default::default()
+        },
+    )?;
+    assert_eq!(out2, out, "the output matches precisely, even with ignore-case");
+    assert_eq!(
+        entries, expected_content,
+        "ignore case doesn't change anything (even though our search is quite different)"
+    );
+    Ok(())
+}
+
 #[test]
 fn cancel_with_collection_does_not_fail() -> crate::Result {
     struct CancelDelegate {
@@ -2105,7 +2169,6 @@ fn cancel_with_collection_does_not_fail() -> crate::Result {
                 walk::Action::Cancel
             } else {
                 self.emits_left_until_cancel -= 1;
-                dbg!(self.emits_left_until_cancel);
                 walk::Action::Continue
             }
         }