another test indicating git-discover misclassifies .git/modules as …

…worktree (#482)
Byron · Aug 17, 2022 · 9133141 · 9133141
1 parent b56b57c
commit 9133141
Showing 1 changed file with 43 additions and 23 deletions.
diff --git a/git-discover/tests/upwards/mod.rs b/git-discover/tests/upwards/mod.rs
@@ -262,31 +262,51 @@ fn do_not_shorten_absolute_paths() -> crate::Result {
     Ok(())
 }
 
-#[test]
-#[ignore]
-fn submodules() -> crate::Result {
-    let dir = git_testtools::scripted_fixture_repo_read_only("make_submodules.sh")?;
-    let parent = dir.join("with-submodules");
-    for module in ["m1", "dir/m1"] {
-        let submodule_m1_workdir = parent.join(module);
-        let (path, _trust) = git_discover::upwards(&submodule_m1_workdir)?;
-        assert!(
-            matches!(path, git_discover::repository::Path::WorkTree(ref dir) if dir == &submodule_m1_workdir),
-            "{:?} should match {:?}",
-            path,
-            submodule_m1_workdir
-        );
+mod submodules {
+    #[test]
+    #[ignore]
+    fn by_their_worktree_checkout() -> crate::Result {
+        let dir = git_testtools::scripted_fixture_repo_read_only("make_submodules.sh")?;
+        let parent = dir.join("with-submodules");
+        for module in ["m1", "dir/m1"] {
+            let submodule_m1_workdir = parent.join(module);
+            let (path, _trust) = git_discover::upwards(&submodule_m1_workdir)?;
+            assert!(
+                matches!(path, git_discover::repository::Path::WorkTree(ref dir) if dir == &submodule_m1_workdir),
+                "{:?} should match {:?}",
+                path,
+                submodule_m1_workdir
+            );
+
+            let submodule_m1_subdir = submodule_m1_workdir.join("subdir");
+            let (path, _trust) = git_discover::upwards(&submodule_m1_subdir)?;
+            assert!(
+                matches!(path, git_discover::repository::Path::WorkTree(ref dir) if dir == &submodule_m1_subdir),
+                "{:?} should match {:?}",
+                path,
+                submodule_m1_subdir
+            );
+        }
+        Ok(())
+    }
 
-        let submodule_m1_subdir = submodule_m1_workdir.join("subdir");
-        let (path, _trust) = git_discover::upwards(&submodule_m1_subdir)?;
-        assert!(
-            matches!(path, git_discover::repository::Path::WorkTree(ref dir) if dir == &submodule_m1_subdir),
-            "{:?} should match {:?}",
-            path,
-            submodule_m1_subdir
-        );
+    #[test]
+    #[ignore]
+    fn by_their_module_git_dir() -> crate::Result {
+        let dir = git_testtools::scripted_fixture_repo_read_only("make_submodules.sh")?;
+        let modules = dir.join("with-submodules").join(".git").join("modules");
+        for module in ["m1", "dir/m1"] {
+            let submodule_m1_gitdir = modules.join(module);
+            let (path, _trust) = git_discover::upwards(&submodule_m1_gitdir)?;
+            assert!(
+                matches!(path, git_discover::repository::Path::Repository(ref dir) if dir == &submodule_m1_gitdir),
+                "{:?} should match {:?}",
+                path,
+                submodule_m1_gitdir
+            );
+        }
+        Ok(())
     }
-    Ok(())
 }
 
 fn repo_path() -> crate::Result<PathBuf> {