adapt to changes in gix-dir

Author: Byron

gitoxide-core/src/repository/clean.rs

@@ -55,7 +55,7 @@ pub(crate) mod function {
             bail!("Need a worktree to clean, this is a bare repository");
         };
 
-        let index = repo.index()?;
+        let index = repo.index_or_empty()?;
         let has_patterns = !patterns.is_empty();
         let mut collect = InterruptableCollect::default();
         let collapse_directories = CollapseDirectory;

gix/src/repository/dirwalk.rs

@@ -1,6 +1,6 @@
 use crate::bstr::BStr;
 use crate::{config, dirwalk, Repository};
-use std::path::Path;
+use std::path::PathBuf;
 
 /// The error returned by [dirwalk()](Repository::dirwalk()).
 #[derive(Debug, thiserror::Error)]
@@ -42,7 +42,8 @@ impl Repository {
         patterns: impl IntoIterator<Item = impl AsRef<BStr>>,
         options: dirwalk::Options,
         delegate: &mut dyn gix_dir::walk::Delegate,
-    ) -> Result<gix_dir::walk::Outcome, Error> {
+    ) -> Result<(gix_dir::walk::Outcome, PathBuf), Error> {
+        let _span = gix_trace::coarse!("gix::dirwalk");
         let workdir = self.work_dir().ok_or(Error::MissinWorkDir)?;
         let mut excludes = self
             .excludes(
@@ -59,14 +60,13 @@ impl Repository {
                 crate::worktree::stack::state::attributes::Source::WorktreeThenIdMapping,
             )?
             .into_parts();
+        gix_trace::debug!(patterns = ?pathspec.patterns().map(|p| p.path()).collect::<Vec<_>>());
 
-        let prefix = self.prefix()?.unwrap_or(Path::new(""));
         let git_dir_realpath =
             crate::path::realpath_opts(self.git_dir(), self.current_dir(), crate::path::realpath::MAX_SYMLINKS)?;
         let fs_caps = self.filesystem_options()?;
         let accelerate_lookup = fs_caps.ignore_case.then(|| index.prepare_icase_backing());
         gix_dir::walk(
-            &workdir.join(prefix),
             workdir,
             gix_dir::walk::Context {
                 git_dir_realpath: git_dir_realpath.as_ref(),
@@ -85,6 +85,7 @@ impl Repository {
                 },
                 excludes: Some(&mut excludes),
                 objects: &self.objects,
+                explicit_traversal_root: None,
             },
             options.into(),
             delegate,

gix/src/repository/filter.rs

@@ -52,7 +52,7 @@ impl Repository {
             let cache = self.attributes_only(&index, gix_worktree::stack::state::attributes::Source::IdMapping)?;
             (cache, IndexPersistedOrInMemory::InMemory(index))
         } else {
-            let index = self.index()?;
+            let index = self.index_or_empty()?;
             let cache = self.attributes_only(
                 &index,
                 gix_worktree::stack::state::attributes::Source::WorktreeThenIdMapping,

gix/tests/fixtures/generated-archives/make_basic_repo.tar.xz

@@ -25,3 +25,10 @@ git init non-bare-repo-without-index
   git add this && git commit -m "init"
   rm .git/index
 )
+
+git init all-untracked
+(cd all-untracked
+  >a
+  mkdir d
+  >d/a
+)

gix/tests/fixtures/make_basic_repo.sh

@@ -1,9 +1,16 @@
 use std::path::Path;
 
+#[test]
+fn pipeline_in_nonbare_repo_without_index() -> crate::Result {
+    let repo = named_subrepo_opts("make_basic_repo.sh", "all-untracked", Default::default())?;
+    let _ = repo.filter_pipeline(None).expect("does not fail due to missing index");
+    Ok(())
+}
+
 use gix::bstr::ByteSlice;
 use gix_filter::driver::apply::Delay;
 
-use crate::util::named_repo;
+use crate::util::{named_repo, named_subrepo_opts};
 
 #[test]
 fn pipeline_in_repo_without_special_options() -> crate::Result {

gix/tests/repository/filter.rs

@@ -34,6 +34,7 @@ mod dirwalk {
                 .map(|e| (e.0.rela_path.to_string(), e.0.disk_kind.expect("kind is known")))
                 .collect::<Vec<_>>(),
             [
+                ("all-untracked".to_string(), Repository),
                 ("bare-repo-with-index.git".to_string(), Directory),
                 ("bare.git".into(), Directory),
                 ("non-bare-repo-without-index".into(), Repository),