status: ignore assume-unchanged submodule paths replaced by symlinks

gix-dir/src/walk/classify.rs

@@ -372,15 +372,23 @@ fn resolve_file_type_with_index(
             None
         };
         (
-            kind.filter(|_| entry.flags.contains(gix_index::entry::Flags::UPTODATE)),
+            kind.filter(|_| {
+                entry
+                    .flags
+                    .intersects(gix_index::entry::Flags::UPTODATE | gix_index::entry::Flags::ASSUME_VALID)
+            }),
             kind,
         )
     }
 
     fn icase_directory_to_kinds(dir: Option<&gix_index::Entry>) -> (Option<entry::Kind>, Option<entry::Kind>) {
         let index_kind = dir.map(|_| entry::Kind::Directory);
         let uptodate_kind = dir
-            .filter(|entry| entry.flags.contains(gix_index::entry::Flags::UPTODATE))
+            .filter(|entry| {
+                entry
+                    .flags
+                    .intersects(gix_index::entry::Flags::UPTODATE | gix_index::entry::Flags::ASSUME_VALID)
+            })
             .map(|_| entry::Kind::Directory);
         (uptodate_kind, index_kind)
     }

gix/tests/fixtures/make_status_repos.sh

@@ -41,3 +41,19 @@ git init untracked-added
   echo content >added
   git add added
 )
+
+git init -q module
+(cd module
+  touch this
+  git add this
+  git commit -q -m c1
+)
+
+git init -q submodule-assume-unchanged-symlink
+(cd submodule-assume-unchanged-symlink
+  git submodule add ../module sub
+  git commit -q -m "add submodule"
+  git update-index --assume-unchanged sub
+  rm -Rf sub
+  ln -s ../module sub
+)

gix/tests/gix/status.rs

@@ -265,6 +265,15 @@ mod into_iter {
         Ok(())
     }
 
+    #[test]
+    fn submodule_assume_unchanged_replaced_with_symlink_is_ignored() -> crate::Result {
+        let repo = repo("submodule-assume-unchanged-symlink")?;
+        let mut status = repo.status(gix::progress::Discard)?.into_iter(None)?;
+        let items: Vec<_> = status.by_ref().filter_map(Result::ok).collect();
+        assert!(items.is_empty(), "assume-unchanged submodule should not show up in status");
+        Ok(())
+    }
+
     #[test]
     fn error_during_tree_traversal_causes_failure() -> crate::Result {
         let repo = repo("untracked-only")?;