Merging upstream version 1.75.0+dfsg1.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/vendor/gix/src/clone/fetch/mod.rs b/vendor/gix/src/clone/fetch/mod.rs
index c03b8f839..663822212 100644
--- a/vendor/gix/src/clone/fetch/mod.rs
+++ b/vendor/gix/src/clone/fetch/mod.rs
@@ -94,7 +94,7 @@ impl PrepareFetch {
             .expect("valid static spec");
         let mut clone_fetch_tags = None;
         if let Some(f) = self.configure_remote.as_mut() {
-            remote = f(remote).map_err(|err| Error::RemoteConfiguration(err))?;
+            remote = f(remote).map_err(Error::RemoteConfiguration)?;
         } else {
             clone_fetch_tags = remote::fetch::Tags::All.into();
         }
@@ -117,7 +117,7 @@ impl PrepareFetch {
         let pending_pack: remote::fetch::Prepare<'_, '_, _> = {
             let mut connection = remote.connect(remote::Direction::Fetch).await?;
             if let Some(f) = self.configure_connection.as_mut() {
-                f(&mut connection).map_err(|err| Error::RemoteConnection(err))?;
+                f(&mut connection).map_err(Error::RemoteConnection)?;
             }
             connection
                 .prepare_fetch(&mut *progress, {
diff --git a/vendor/gix/src/clone/fetch/util.rs b/vendor/gix/src/clone/fetch/util.rs
index ab90435d0..db9bc0a1c 100644
--- a/vendor/gix/src/clone/fetch/util.rs
+++ b/vendor/gix/src/clone/fetch/util.rs
@@ -189,7 +189,7 @@ fn setup_branch_config(
     remote_name: &BStr,
 ) -> Result<(), Error> {
     let short_name = match branch.category_and_short_name() {
-        Some((cat, shortened)) if cat == gix_ref::Category::LocalBranch => match shortened.to_str() {
+        Some((gix_ref::Category::LocalBranch, shortened)) => match shortened.to_str() {
             Ok(s) => s,
             Err(_) => return Ok(()),
         },