diff options
Diffstat (limited to 'vendor/gix/src/config')
| -rw-r--r-- | vendor/gix/src/config/cache/access.rs | 10 | ||||
| -rw-r--r-- | vendor/gix/src/config/tree/keys.rs | 2 | ||||
| -rw-r--r-- | vendor/gix/src/config/tree/sections/core.rs | 3 |
3 files changed, 4 insertions, 11 deletions
diff --git a/vendor/gix/src/config/cache/access.rs b/vendor/gix/src/config/cache/access.rs index 352bc9712..3e763c028 100644 --- a/vendor/gix/src/config/cache/access.rs +++ b/vendor/gix/src/config/cache/access.rs @@ -158,13 +158,7 @@ impl Cache { pub(crate) fn stat_options(&self) -> Result<gix_index::entry::stat::Options, config::stat_options::Error> { use crate::config::tree::gitoxide; Ok(gix_index::entry::stat::Options { - trust_ctime: boolean( - self, - "core.trustCTime", - &Core::TRUST_C_TIME, - // For now, on MacOS it's known to not be trust-worthy at least with the Rust STDlib, being 2s off - !cfg!(target_os = "macos"), - )?, + trust_ctime: boolean(self, "core.trustCTime", &Core::TRUST_C_TIME, true)?, use_nsec: boolean(self, "gitoxide.core.useNsec", &gitoxide::Core::USE_NSEC, false)?, use_stdev: boolean(self, "gitoxide.core.useStdev", &gitoxide::Core::USE_STDEV, false)?, check_stat: self @@ -309,7 +303,7 @@ impl Cache { &gitoxide::Pathspec::LITERAL, ] .iter() - .find_map(|key| (key.environment_override().expect("set") == name).then_some(key)) + .find(|key| key.environment_override().expect("set") == name) .expect("we must know all possible input variable names"); let val = self diff --git a/vendor/gix/src/config/tree/keys.rs b/vendor/gix/src/config/tree/keys.rs index 5a5257af5..15cfba2d9 100644 --- a/vendor/gix/src/config/tree/keys.rs +++ b/vendor/gix/src/config/tree/keys.rs @@ -237,7 +237,7 @@ mod lock_timeout { let value = value.map_err(|err| config::lock_timeout::Error::from(self).with_source(err))?; Ok(match value { val if val < 0 => Fail::AfterDurationWithBackoff(Duration::from_secs(u64::MAX)), - val if val == 0 => Fail::Immediately, + 0 => Fail::Immediately, val => Fail::AfterDurationWithBackoff(Duration::from_millis( val.try_into().expect("i64 to u64 always works if positive"), )), diff --git a/vendor/gix/src/config/tree/sections/core.rs b/vendor/gix/src/config/tree/sections/core.rs index ab3e2bab9..2ec5c279e 100644 --- a/vendor/gix/src/config/tree/sections/core.rs +++ b/vendor/gix/src/config/tree/sections/core.rs @@ -45,8 +45,7 @@ impl Core { /// The `core.symlinks` key. pub const SYMLINKS: keys::Boolean = keys::Boolean::new_boolean("symlinks", &config::Tree::CORE); /// The `core.trustCTime` key. - pub const TRUST_C_TIME: keys::Boolean = keys::Boolean::new_boolean("trustCTime", &config::Tree::CORE) - .with_deviation("Currently the default is false, instead of true, as it seems to be 2s off in tests"); + pub const TRUST_C_TIME: keys::Boolean = keys::Boolean::new_boolean("trustCTime", &config::Tree::CORE); /// The `core.worktree` key. pub const WORKTREE: keys::Any = keys::Any::new("worktree", &config::Tree::CORE) .with_environment_override("GIT_WORK_TREE") |