Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 5 insertions, 4 deletions

diff --git a/vendor/gix/src/open/permissions.rs b/vendor/gix/src/open/permissions.rs
index 633575a9d..6a72beef2 100644
--- a/vendor/gix/src/open/permissions.rs
+++ b/vendor/gix/src/open/permissions.rs
@@ -1,7 +1,8 @@
 //! Various permissions to define what can be done when operating a [`Repository`][crate::Repository].
-use crate::open::Permissions;
 use gix_sec::Trust;
 
+use crate::open::Permissions;
+
 /// Configure from which sources git configuration may be loaded.
 ///
 /// Note that configuration from inside of the repository is always loaded as it's definitely required for correctness.
diff --git a/vendor/gix/src/open/repository.rs b/vendor/gix/src/open/repository.rs
index c7702b5f6..e89fdc430 100644
--- a/vendor/gix/src/open/repository.rs
+++ b/vendor/gix/src/open/repository.rs
@@ -284,12 +284,12 @@ fn replacement_objects_refs_prefix(
     mut filter_config_section: fn(&gix_config::file::Metadata) -> bool,
 ) -> Result<Option<PathBuf>, Error> {
     let is_disabled = config
-        .boolean_filter_by_key("gitoxide.objects.noReplace", &mut filter_config_section)
-        .map(|b| gitoxide::Objects::NO_REPLACE.enrich_error(b))
+        .boolean_filter_by_key("core.useReplaceRefs", &mut filter_config_section)
+        .map(|b| Core::USE_REPLACE_REFS.enrich_error(b))
         .transpose()
         .with_leniency(lenient)
         .map_err(config::Error::ConfigBoolean)?
-        .unwrap_or_default();
+        .unwrap_or(true);
 
     if is_disabled {
         return Ok(None);