Skip to content

Commit 04f011c

Browse files
committed
Merge branch 'adjustments-for-cargo'
2 parents 9a9fa96 + 9010f58 commit 04f011c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

gix-revision/src/graph/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub mod lookup {
1414
#[derive(Debug, thiserror::Error)]
1515
#[allow(missing_docs)]
1616
pub enum Error {
17-
#[error("There was an error looking up a commit")]
17+
#[error(transparent)]
1818
Find(#[from] crate::graph::lookup::Error),
1919
#[error(transparent)]
2020
ToOwned(#[from] crate::graph::commit::to_owned::Error),

gix/src/env.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ pub mod collate {
119119
Error::Fetch(
120120
crate::remote::fetch::Error::PackThreads(_)
121121
| crate::remote::fetch::Error::PackIndexVersion(_)
122-
| crate::remote::fetch::Error::RemovePackKeepFile { .. },
122+
| crate::remote::fetch::Error::RemovePackKeepFile { .. }
123+
| crate::remote::fetch::Error::Negotiate(_),
123124
) => true,
124125
_ => false,
125126
}

0 commit comments

Comments
 (0)