Merge branch 'adjustments-for-cargo'

GitoxideLabs · Jun 6, 2023 · 04f011c · 04f011c
2 parents 9a9fa96 + 9010f58
commit 04f011c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gix-revision/src/graph/errors.rs b/gix-revision/src/graph/errors.rs
@@ -14,7 +14,7 @@ pub mod lookup {
         #[derive(Debug, thiserror::Error)]
         #[allow(missing_docs)]
         pub enum Error {
-            #[error("There was an error looking up a commit")]
+            #[error(transparent)]
             Find(#[from] crate::graph::lookup::Error),
             #[error(transparent)]
             ToOwned(#[from] crate::graph::commit::to_owned::Error),

diff --git a/gix/src/env.rs b/gix/src/env.rs
@@ -119,7 +119,8 @@ pub mod collate {
                     Error::Fetch(
                         crate::remote::fetch::Error::PackThreads(_)
                         | crate::remote::fetch::Error::PackIndexVersion(_)
-                        | crate::remote::fetch::Error::RemovePackKeepFile { .. },
+                        | crate::remote::fetch::Error::RemovePackKeepFile { .. }
+                        | crate::remote::fetch::Error::Negotiate(_),
                     ) => true,
                     _ => false,
                 }