Merging upstream version 1.70.0+dfsg2.

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

1 files changed, 18 insertions, 0 deletions

diff --git a/vendor/gix/src/mailmap.rs b/vendor/gix/src/mailmap.rs
new file mode 100644
index 000000000..6ea6bcc2d
--- /dev/null
+++ b/vendor/gix/src/mailmap.rs
@@ -0,0 +1,18 @@
+pub use gix_mailmap::*;
+
+///
+pub mod load {
+    /// The error returned by [`crate::Repository::open_mailmap_into()`].
+    #[derive(Debug, thiserror::Error)]
+    #[allow(missing_docs)]
+    pub enum Error {
+        #[error("The mailmap file declared in `mailmap.file` could not be read")]
+        Io(#[from] std::io::Error),
+        #[error("The configured mailmap.blob could not be parsed")]
+        BlobSpec(#[from] gix_hash::decode::Error),
+        #[error(transparent)]
+        PathInterpolate(#[from] gix_config::path::interpolate::Error),
+        #[error("Could not find object configured in `mailmap.blob`")]
+        FindExisting(#[from] crate::object::find::existing::Error),
+    }
+}