adapt to changes in gix-features

Byron · Byron · commit eacb5a4ae2fd · 2024-01-17T17:21:08.000+01:00
diff --git a/gix-discover/src/is.rs b/gix-discover/src/is.rs
@@ -177,6 +177,7 @@ pub(crate) fn git_with_metadata(
             dot_git.as_ref().into(),
             gix_ref::store::WriteReflog::Normal,
             object_hash_should_not_matter_here,
+            false,
         );
         let head = refs.find_loose("HEAD")?;
         if head.name.as_bstr() != "HEAD" {
diff --git a/gix-negotiate/tests/baseline/mod.rs b/gix-negotiate/tests/baseline/mod.rs
@@ -28,6 +28,7 @@ fn run() -> crate::Result {
                 base.join("client").join(".git"),
                 WriteReflog::Disable,
                 gix_hash::Kind::Sha1,
+                false,
             );
             let lookup_names = |names: &[&str]| -> Vec<gix_hash::ObjectId> {
                 names
diff --git a/gix-odb/src/store_impls/loose/find.rs b/gix-odb/src/store_impls/loose/find.rs
@@ -56,6 +56,7 @@ impl Store {
             inner: gix_features::fs::walkdir_new(
                 &self.path.join(prefix.as_oid().to_hex_with_len(2).to_string()),
                 gix_features::fs::walkdir::Parallelism::Serial,
+                false,
             )
             .min_depth(1)
             .max_depth(1)
diff --git a/gix-odb/src/store_impls/loose/iter.rs b/gix-odb/src/store_impls/loose/iter.rs
@@ -70,6 +70,7 @@ impl loose::Store {
                 fs::walkdir::Parallelism::ThreadPoolPerTraversal {
                     thread_name: "gix_odb::loose::Store::iter: fs-walk",
                 },
+                false,
             )
             .min_depth(2)
             .max_depth(3)
diff --git a/gix-submodule/tests/file/baseline.rs b/gix-submodule/tests/file/baseline.rs
@@ -61,14 +61,14 @@ fn common_values_and_names_by_path() -> crate::Result {
 
 fn module_files() -> impl Iterator<Item = (PathBuf, PathBuf)> {
     let dir = gix_testtools::scripted_fixture_read_only("basic.sh").expect("valid fixture");
-    gix_features::fs::walkdir_sorted_new(&dir, Parallelism::Serial)
+    gix_features::fs::walkdir_sorted_new(&dir, Parallelism::Serial, false)
         .follow_links(false)
         .into_iter()
         .filter_map(move |entry| {
             let entry = entry.unwrap();
             (entry.file_name() == OsStr::new(".gitmodules")).then(|| {
                 (
-                    entry.path().to_owned(),
+                    entry.path().into_owned(),
                     entry
                         .path()
                         .strip_prefix(&dir)
diff --git a/gix/src/open/repository.rs b/gix/src/open/repository.rs
@@ -5,6 +5,7 @@ use gix_features::threading::OwnShared;
 use gix_macros::momo;
 
 use super::{Error, Options};
+use crate::config::cache::util::ApplyLeniency;
 use crate::{
     config,
     config::{
@@ -194,11 +195,23 @@ impl ThreadSafeRepository {
         let mut refs = {
             let reflog = repo_config.reflog.unwrap_or(gix_ref::store::WriteReflog::Disable);
             let object_hash = repo_config.object_hash;
+            let precompose_unicode = repo_config
+                .git_dir_config
+                .boolean("core", None, Core::PRECOMPOSE_UNICODE.name())
+                .map(|v| Core::PRECOMPOSE_UNICODE.enrich_error(v))
+                .transpose()
+                .with_leniency(lenient_config)
+                .map_err(|err| Error::Config(err.into()))?
+                .unwrap_or_default();
             match &common_dir {
-                Some(common_dir) => {
-                    crate::RefStore::for_linked_worktree(git_dir.to_owned(), common_dir.into(), reflog, object_hash)
-                }
-                None => crate::RefStore::at(git_dir.to_owned(), reflog, object_hash),
+                Some(common_dir) => crate::RefStore::for_linked_worktree(
+                    git_dir.to_owned(),
+                    common_dir.into(),
+                    reflog,
+                    object_hash,
+                    precompose_unicode,
+                ),
+                None => crate::RefStore::at(git_dir.to_owned(), reflog, object_hash, precompose_unicode),
             }
         };
         let head = refs.find("HEAD").ok();

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ impl Store {`
`56`	`56`	`inner: gix_features::fs::walkdir_new(`
`57`	`57`	`&self.path.join(prefix.as_oid().to_hex_with_len(2).to_string()),`
`58`	`58`	`gix_features::fs::walkdir::Parallelism::Serial,`
	`59`	`+ false,`
`59`	`60`	`)`
`60`	`61`	`.min_depth(1)`
`61`	`62`	`.max_depth(1)`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ impl loose::Store {`
`70`	`70`	`fs::walkdir::Parallelism::ThreadPoolPerTraversal {`
`71`	`71`	`thread_name: "gix_odb::loose::Store::iter: fs-walk",`
`72`	`72`	`},`
	`73`	`+ false,`
`73`	`74`	`)`
`74`	`75`	`.min_depth(2)`
`75`	`76`	`.max_depth(3)`