Merge pull request #2437 from GitoxideLabs/copilot/fix-issue-2435-in-gix-crate

status: ignore assume-unchanged submodule paths replaced by symlinks

Author: Byron

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-dir/tests/dir/walk.rs

@@ -245,6 +245,67 @@ fn root_may_be_a_symlink_if_it_is_the_worktree() -> crate::Result {
     Ok(())
 }
 
+#[test]
+#[cfg(unix)]
+fn assume_unchanged_submodule_replaced_with_symlink_is_hidden() -> crate::Result {
+    let root = fixture_in("many-symlinks", "submodule-assume-unchanged-symlink");
+    let ((out, _root), entries) = try_collect_filtered_opts_collect(
+        &root,
+        None,
+        |keep, ctx| walk(&root, ctx, options(), keep),
+        None::<&str>,
+        Options {
+            fresh_index: false,
+            ..Default::default()
+        },
+    )?;
+
+    assert_eq!(
+        out,
+        walk::Outcome {
+            read_dir_calls: 1,
+            returned_entries: entries.len(),
+            seen_entries: 3,
+        }
+    );
+    assert!(
+        entries.is_empty(),
+        "assume-unchanged entries should use index type information and stay hidden"
+    );
+    Ok(())
+}
+
+#[test]
+#[cfg(unix)]
+fn submodule_replaced_with_symlink_without_assume_unchanged_is_untracked() -> crate::Result {
+    let root = fixture_in("many-symlinks", "submodule-symlink");
+    let ((out, _root), entries) = try_collect_filtered_opts_collect(
+        &root,
+        None,
+        |keep, ctx| walk(&root, ctx, options(), keep),
+        None::<&str>,
+        Options {
+            fresh_index: false,
+            ..Default::default()
+        },
+    )?;
+
+    assert_eq!(
+        out,
+        walk::Outcome {
+            read_dir_calls: 1,
+            returned_entries: entries.len(),
+            seen_entries: 3,
+        }
+    );
+    assert_eq!(
+        entries,
+        [entry("sub", Untracked, Symlink).with_index_kind(Repository)],
+        "without assume-unchanged, the replaced submodule appears as an untracked symlink"
+    );
+    Ok(())
+}
+
 #[test]
 fn should_interrupt_works_even_in_empty_directories() {
     let root = fixture("empty");

gix-dir/tests/fixtures/many-symlinks.sh

@@ -42,3 +42,27 @@ EOF
 )
 
 ln -s excluded-symlinks-to-dir worktree-root-is-symlink
+
+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
+)
+
+git init -q submodule-symlink
+(cd submodule-symlink
+  git submodule add ../module sub
+  git commit -q -m "add submodule"
+  rm -Rf sub
+  ln -s ../module sub
+)

gix/tests/fixtures/generated-archives/make_status_repos.tar

@@ -53,3 +53,19 @@ git init symlink-replaces-tracked-dir
   rm -rf tracked
   ln -s target tracked
 )
+
+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/fixtures/make_status_repos.sh

@@ -265,6 +265,19 @@ mod into_iter {
         Ok(())
     }
 
+    #[test]
+    #[cfg(unix)]
+    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")?;