Merging upstream version 1.71.1+dfsg1.

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

5 files changed, 49 insertions, 10 deletions

diff --git a/vendor/gix-mailmap/.cargo-checksum.json b/vendor/gix-mailmap/.cargo-checksum.json
index 756c2e48f..fe19111a9 100644
--- a/vendor/gix-mailmap/.cargo-checksum.json
+++ b/vendor/gix-mailmap/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"8ca82d725b7a3fdaf62b9ac30adaa9ba5c2922dbda3d9a7926a4baa3ff86a980","Cargo.toml":"f248713e5722281d8c809c7964cfc28b093820b8498525e735181cb22dba9221","src/entry.rs":"77e63ac850b7d5d5af3c1c5184e221efb39c480dd5fd00484cad5d173a56c2db","src/lib.rs":"2dbe93c781d1f27f5b4070cb497ba75eacf12640dd560b3ca804cb8292a0bbe6","src/parse.rs":"b509a5ee86e7690b4e91f305909a28fed2077a931d91b998b4843c8dba98ceae","src/snapshot/entry.rs":"c30a21ffafdaebdb66fa5af724a6d3435e329d746f9b24efe4ae4ba9f1e19e84","src/snapshot/mod.rs":"c853a5a40bd60b62d29d1e5de528f2f9d029d07da94cf10f31a01f7bfa653d35","src/snapshot/signature.rs":"83790225f8225e6ac9f4438a1937202cb1eed0c57aed8a3f8873672bbba4dd92","src/snapshot/util.rs":"47579223fdced5ce907cb853dfe18ae983978085be5763b103ba071e538d60db","tests/fixtures/invalid.txt":"9a575f1df5c5608c2138154909eb790308a793783a16ccf9164189ed98154b1c","tests/fixtures/overwrite.txt":"ab8b622934003f16c8add329d07ca282f3cea62cbb95c479ca166f629f60bc45","tests/fixtures/typical.txt":"2fbda9e1cff5bd1b5904056f88a7a28ce086f94f203e4324f3d0fd6d301c44db","tests/mailmap.rs":"e9590a37dbd86c0d1138f5bb6a841f8830e81f5c2f65a9d972aa94090d8cda36","tests/parse/mod.rs":"74a147082d0fdd4a1aedd8d500420c35a911b77a22433cccd079e1650e130676","tests/snapshot/mod.rs":"c32d46784b94294f88e344e09482174fee8355a2dd66d03f8ec292c6fd2e2a09"},"package":"2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"4b5c40e414ea7fcc0b7ff17a4c910f8f4e169a06de34edcb8b4da91cbf517fd9","Cargo.toml":"03415ec0549871d9fe3dd98841995196dce1be1d8351a6ed5ca9829588d3213b","src/entry.rs":"77e63ac850b7d5d5af3c1c5184e221efb39c480dd5fd00484cad5d173a56c2db","src/lib.rs":"e0c799bd0c808f3dafb8fc313b296fd8f4108c00e0bb7ccf4b11750ba6d18800","src/parse.rs":"b509a5ee86e7690b4e91f305909a28fed2077a931d91b998b4843c8dba98ceae","src/snapshot/entry.rs":"c30a21ffafdaebdb66fa5af724a6d3435e329d746f9b24efe4ae4ba9f1e19e84","src/snapshot/mod.rs":"c853a5a40bd60b62d29d1e5de528f2f9d029d07da94cf10f31a01f7bfa653d35","src/snapshot/signature.rs":"8e69611ce3e16fa9fd787caed7c38f33f92db285be45d2cb49d1d81636a45757","src/snapshot/util.rs":"47579223fdced5ce907cb853dfe18ae983978085be5763b103ba071e538d60db","tests/fixtures/invalid.txt":"9a575f1df5c5608c2138154909eb790308a793783a16ccf9164189ed98154b1c","tests/fixtures/overwrite.txt":"ab8b622934003f16c8add329d07ca282f3cea62cbb95c479ca166f629f60bc45","tests/fixtures/typical.txt":"2fbda9e1cff5bd1b5904056f88a7a28ce086f94f203e4324f3d0fd6d301c44db","tests/mailmap.rs":"e9590a37dbd86c0d1138f5bb6a841f8830e81f5c2f65a9d972aa94090d8cda36","tests/parse/mod.rs":"74a147082d0fdd4a1aedd8d500420c35a911b77a22433cccd079e1650e130676","tests/snapshot/mod.rs":"c32d46784b94294f88e344e09482174fee8355a2dd66d03f8ec292c6fd2e2a09"},"package":"e8856cec3bdc3610c06970d28b6cb20a0c6621621cf9a8ec48cbd23f2630f362"}
\ No newline at end of file
diff --git a/vendor/gix-mailmap/CHANGELOG.md b/vendor/gix-mailmap/CHANGELOG.md
index e8402224e..06ae4756c 100644
--- a/vendor/gix-mailmap/CHANGELOG.md
+++ b/vendor/gix-mailmap/CHANGELOG.md
@@ -5,6 +5,44 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.12.0 (2023-04-26)
+
+### New Features (BREAKING)
+
+ - <csr-id-b83ee366a3c65c717beb587ad809268f1c54b8ad/> Rename `serde1` cargo feature to `serde` and use the weak-deps cargo capability.
+   With it it's possible to not automatically declare all optional dependencies externally visible
+   features, and thus re-use feature names that oterwise are also a crate name.
+   
+   Previously I thought that `serde1` is for future-proofing and supporting multiple serde versions
+   at the same time. However, it's most definitely a burden I wouldn't want anyway, so using
+   `serde` seems to be the way to go into the future.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 7 commits contributed to the release over the course of 9 calendar days.
+ - 53 days passed between releases.
+ - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#814](https://github.com/Byron/gitoxide/issues/814)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#814](https://github.com/Byron/gitoxide/issues/814)**
+    - Rename `serde1` cargo feature to `serde` and use the weak-deps cargo capability. ([`b83ee36`](https://github.com/Byron/gitoxide/commit/b83ee366a3c65c717beb587ad809268f1c54b8ad))
+ * **Uncategorized**
+    - Release gix-index v0.16.0, gix-mailmap v0.12.0, gix-pack v0.34.0, gix-odb v0.44.0, gix-packetline v0.16.0, gix-transport v0.30.0, gix-protocol v0.31.0, gix-revision v0.13.0, gix-refspec v0.10.0, gix-worktree v0.16.0, gix v0.44.0 ([`e4df557`](https://github.com/Byron/gitoxide/commit/e4df5574c0813a0236319fa6e8b3b41bab179fc8))
+    - Release gix-hash v0.11.1, gix-path v0.7.4, gix-glob v0.6.0, gix-attributes v0.11.0, gix-config-value v0.11.0, gix-fs v0.1.1, gix-tempfile v5.0.3, gix-utils v0.1.1, gix-lock v5.0.1, gix-object v0.29.1, gix-ref v0.28.0, gix-sec v0.7.0, gix-config v0.21.0, gix-prompt v0.4.0, gix-url v0.17.0, gix-credentials v0.13.0, gix-diff v0.29.0, gix-discover v0.17.0, gix-hashtable v0.2.0, gix-ignore v0.1.0, gix-bitmap v0.2.3, gix-traverse v0.25.0, gix-index v0.16.0, gix-mailmap v0.12.0, gix-pack v0.34.0, gix-odb v0.44.0, gix-packetline v0.16.0, gix-transport v0.30.0, gix-protocol v0.31.0, gix-revision v0.13.0, gix-refspec v0.10.0, gix-worktree v0.16.0, gix v0.44.0, safety bump 7 crates ([`91134a1`](https://github.com/Byron/gitoxide/commit/91134a11c8ba0e942f692488ec9bce9fa1086324))
+    - Prepare changelogs prior to release ([`30a1a71`](https://github.com/Byron/gitoxide/commit/30a1a71f36f24faac0e0b362ffdfedea7f9cdbf1))
+    - Release gix-utils v0.1.0, gix-hash v0.11.0, gix-date v0.5.0, gix-features v0.29.0, gix-actor v0.20.0, gix-object v0.29.0, gix-archive v0.1.0, gix-fs v0.1.0, safety bump 25 crates ([`8dbd0a6`](https://github.com/Byron/gitoxide/commit/8dbd0a60557a85acfa231800a058cbac0271a8cf))
+    - Merge branch 'main' into dev ([`cdef398`](https://github.com/Byron/gitoxide/commit/cdef398c4a3bd01baf0be2c27a3f77a400172b0d))
+    - Rename the serde1 feature to serde ([`19338d9`](https://github.com/Byron/gitoxide/commit/19338d934b6712b7d6bd3fa3b2e4189bf7e6c8a1))
+</details>
+
 ## 0.11.0 (2023-03-04)
 
 A maintenance release without user-facing changes.
@@ -13,7 +51,7 @@ A maintenance release without user-facing changes.
 
 <csr-read-only-do-not-edit/>
 
- - 2 commits contributed to the release.
+ - 3 commits contributed to the release.
  - 3 days passed between releases.
  - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
@@ -25,6 +63,7 @@ A maintenance release without user-facing changes.
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release gix-attributes v0.10.0, gix-ref v0.26.0, gix-config v0.18.0, gix-url v0.15.0, gix-credentials v0.11.0, gix-discover v0.15.0, gix-index v0.14.0, gix-mailmap v0.11.0, gix-odb v0.42.0, gix-transport v0.27.0, gix-protocol v0.28.0, gix-revision v0.12.0, gix-refspec v0.9.0, gix-worktree v0.14.0, gix v0.39.0 ([`93e75fe`](https://github.com/Byron/gitoxide/commit/93e75fed454ed8b342231bde4638db90e407ce52))
     - Prepare changelogs prior to release ([`895e482`](https://github.com/Byron/gitoxide/commit/895e482badf01e953bb9144001eebd5e1b1c4d84))
     - Release gix-features v0.28.0, gix-actor v0.19.0, gix-object v0.28.0, gix-diff v0.28.0, gix-traverse v0.24.0, gix-pack v0.32.0, safety bump 20 crates ([`0f411e9`](https://github.com/Byron/gitoxide/commit/0f411e93ec812592bb9d3a52b751399dd86f76f7))
 </details>
diff --git a/vendor/gix-mailmap/Cargo.toml b/vendor/gix-mailmap/Cargo.toml
index 8b7d74914..61605a82e 100644
--- a/vendor/gix-mailmap/Cargo.toml
+++ b/vendor/gix-mailmap/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.64"
 name = "gix-mailmap"
-version = "0.11.0"
+version = "0.12.0"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 description = "A WIP crate of the gitoxide project for parsing mailmap files"
 license = "MIT/Apache-2.0"
@@ -43,7 +43,7 @@ version = "0.2.0"
 optional = true
 
 [dependencies.gix-actor]
-version = "^0.19.0"
+version = "^0.20.0"
 
 [dependencies.serde]
 version = "1.0.114"
@@ -57,8 +57,8 @@ version = "1.0.38"
 [dev-dependencies]
 
 [features]
-serde1 = [
-    "serde",
+serde = [
+    "dep:serde",
     "bstr/serde",
-    "gix-actor/serde1",
+    "gix-actor/serde",
 ]
diff --git a/vendor/gix-mailmap/src/lib.rs b/vendor/gix-mailmap/src/lib.rs
index ce7a6472e..e67521314 100644
--- a/vendor/gix-mailmap/src/lib.rs
+++ b/vendor/gix-mailmap/src/lib.rs
@@ -49,9 +49,9 @@ pub struct Snapshot {
 ///
 /// Typically created by [parse()].
 #[derive(PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone, Copy, Default)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Entry<'a> {
-    #[cfg_attr(feature = "serde1", serde(borrow))]
+    #[cfg_attr(feature = "serde", serde(borrow))]
     /// The name to map to.
     pub(crate) new_name: Option<&'a BStr>,
     /// The email map to.
diff --git a/vendor/gix-mailmap/src/snapshot/signature.rs b/vendor/gix-mailmap/src/snapshot/signature.rs
index 20488db58..d4c5955f5 100644
--- a/vendor/gix-mailmap/src/snapshot/signature.rs
+++ b/vendor/gix-mailmap/src/snapshot/signature.rs
@@ -4,7 +4,7 @@ use bstr::{BStr, BString, ByteSlice};
 
 /// A signature like [`gix_actor::Signature`], but with all string fields being a `Cow`.
 #[derive(Default, PartialEq, Eq, Debug, Hash, Ord, PartialOrd, Clone)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Signature<'a> {
     /// The possibly mapped name.
     pub name: Cow<'a, BStr>,