Skip to content

Commit eacb5a4

Browse files
committed
adapt to changes in gix-features
1 parent 7523e5c commit eacb5a4

File tree

6 files changed

+23
-6
lines changed

6 files changed

+23
-6
lines changed

gix-discover/src/is.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ pub(crate) fn git_with_metadata(
177177
dot_git.as_ref().into(),
178178
gix_ref::store::WriteReflog::Normal,
179179
object_hash_should_not_matter_here,
180+
false,
180181
);
181182
let head = refs.find_loose("HEAD")?;
182183
if head.name.as_bstr() != "HEAD" {

gix-negotiate/tests/baseline/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ fn run() -> crate::Result {
2828
base.join("client").join(".git"),
2929
WriteReflog::Disable,
3030
gix_hash::Kind::Sha1,
31+
false,
3132
);
3233
let lookup_names = |names: &[&str]| -> Vec<gix_hash::ObjectId> {
3334
names

gix-odb/src/store_impls/loose/find.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ impl Store {
5656
inner: gix_features::fs::walkdir_new(
5757
&self.path.join(prefix.as_oid().to_hex_with_len(2).to_string()),
5858
gix_features::fs::walkdir::Parallelism::Serial,
59+
false,
5960
)
6061
.min_depth(1)
6162
.max_depth(1)

gix-odb/src/store_impls/loose/iter.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ impl loose::Store {
7070
fs::walkdir::Parallelism::ThreadPoolPerTraversal {
7171
thread_name: "gix_odb::loose::Store::iter: fs-walk",
7272
},
73+
false,
7374
)
7475
.min_depth(2)
7576
.max_depth(3)

gix-submodule/tests/file/baseline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,14 @@ fn common_values_and_names_by_path() -> crate::Result {
6161

6262
fn module_files() -> impl Iterator<Item = (PathBuf, PathBuf)> {
6363
let dir = gix_testtools::scripted_fixture_read_only("basic.sh").expect("valid fixture");
64-
gix_features::fs::walkdir_sorted_new(&dir, Parallelism::Serial)
64+
gix_features::fs::walkdir_sorted_new(&dir, Parallelism::Serial, false)
6565
.follow_links(false)
6666
.into_iter()
6767
.filter_map(move |entry| {
6868
let entry = entry.unwrap();
6969
(entry.file_name() == OsStr::new(".gitmodules")).then(|| {
7070
(
71-
entry.path().to_owned(),
71+
entry.path().into_owned(),
7272
entry
7373
.path()
7474
.strip_prefix(&dir)

gix/src/open/repository.rs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use gix_features::threading::OwnShared;
55
use gix_macros::momo;
66

77
use super::{Error, Options};
8+
use crate::config::cache::util::ApplyLeniency;
89
use crate::{
910
config,
1011
config::{
@@ -194,11 +195,23 @@ impl ThreadSafeRepository {
194195
let mut refs = {
195196
let reflog = repo_config.reflog.unwrap_or(gix_ref::store::WriteReflog::Disable);
196197
let object_hash = repo_config.object_hash;
198+
let precompose_unicode = repo_config
199+
.git_dir_config
200+
.boolean("core", None, Core::PRECOMPOSE_UNICODE.name())
201+
.map(|v| Core::PRECOMPOSE_UNICODE.enrich_error(v))
202+
.transpose()
203+
.with_leniency(lenient_config)
204+
.map_err(|err| Error::Config(err.into()))?
205+
.unwrap_or_default();
197206
match &common_dir {
198-
Some(common_dir) => {
199-
crate::RefStore::for_linked_worktree(git_dir.to_owned(), common_dir.into(), reflog, object_hash)
200-
}
201-
None => crate::RefStore::at(git_dir.to_owned(), reflog, object_hash),
207+
Some(common_dir) => crate::RefStore::for_linked_worktree(
208+
git_dir.to_owned(),
209+
common_dir.into(),
210+
reflog,
211+
object_hash,
212+
precompose_unicode,
213+
),
214+
None => crate::RefStore::at(git_dir.to_owned(), reflog, object_hash, precompose_unicode),
202215
}
203216
};
204217
let head = refs.find("HEAD").ok();

0 commit comments

Comments
 (0)