Merging upstream version 1.76.0+dfsg1.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/vendor/gix/src/attribute_stack.rs b/vendor/gix/src/attribute_stack.rs
index 1aaca0f2b..66497def6 100644
--- a/vendor/gix/src/attribute_stack.rs
+++ b/vendor/gix/src/attribute_stack.rs
@@ -1,9 +1,7 @@
-use crate::bstr::BStr;
-use crate::types::AttributeStack;
-use crate::Repository;
-use gix_odb::FindExt;
 use std::ops::{Deref, DerefMut};
 
+use crate::{bstr::BStr, types::AttributeStack, Repository};
+
 /// Lifecycle
 impl<'repo> AttributeStack<'repo> {
     /// Create a new instance from a `repo` and the underlying pre-configured `stack`.
@@ -46,8 +44,7 @@ impl<'repo> AttributeStack<'repo> {
         relative: impl AsRef<std::path::Path>,
         is_dir: Option<bool>,
     ) -> std::io::Result<gix_worktree::stack::Platform<'_>> {
-        self.inner
-            .at_path(relative, is_dir, |id, buf| self.repo.objects.find_blob(id, buf))
+        self.inner.at_path(relative, is_dir, &self.repo.objects)
     }
 
     /// Obtain a platform for lookups from a repo-`relative` path, typically obtained from an index entry. `is_dir` should reflect
@@ -63,7 +60,6 @@ impl<'repo> AttributeStack<'repo> {
         relative: impl Into<&'r BStr>,
         is_dir: Option<bool>,
     ) -> std::io::Result<gix_worktree::stack::Platform<'_>> {
-        self.inner
-            .at_entry(relative, is_dir, |id, buf| self.repo.objects.find_blob(id, buf))
+        self.inner.at_entry(relative, is_dir, &self.repo.objects)
     }
 }