Merging upstream version 1.71.1+dfsg1.

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

6 files changed, 141 insertions, 22 deletions

diff --git a/vendor/gix-revision/.cargo-checksum.json b/vendor/gix-revision/.cargo-checksum.json
index 0c6c973f6..a4281e115 100644
--- a/vendor/gix-revision/.cargo-checksum.json
+++ b/vendor/gix-revision/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"a85a52ff78e0930393438870fc083f16d8dca2758a3abcbf989a63ffc41082d9","Cargo.toml":"d6ea631d7dd4d337504d025de2a9d9a3e09824e03029c6d64afc29c60c2f8d31","README.md":"809c88a6c70ec74eabc883e40f5be368890c1929f7575e49e38256cde671f813","src/describe.rs":"2eebe90d99919f4dbb5a2bb2c0113d7c74cc199ad78c2182bf7964ce6639deb0","src/lib.rs":"17f9751f585ae2bc1b16691a4834898b583508c0de8276fcb5cf1d6c4c045e92","src/spec/mod.rs":"0be41875ae48abbce221b1a0be56dc1f5ec95c40f06ab3322db88bc77d11ed0b","src/spec/parse/delegate.rs":"b00c2d9ab8fdea72200f7f781662bf07f31164cb8b5a9831824c8a8d9d0c2277","src/spec/parse/function.rs":"35a1c86b914d535e8928ebfd2d1a4e2a80735128749730434aedb97224758869","src/spec/parse/mod.rs":"a5a565d483088cd3a4a48cad09fa78f9eae2f18fd844ffb0b9fb0afd4bfd7617","src/types.rs":"22d0a4224e6289c324ebc57dd24042b01cf59335b7fba53831b8d1fcbc3e8014"},"package":"ed98e4a0254953c64bc913bd23146a1de662067d5cf974cbdde396958b39e5b0"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"273973dd2b8016144e2b944e12b86e82b4e8fc4215696fa2d9ce8293b45e09bf","Cargo.toml":"1a6d0c90d98126520ee5309f4622803c7ddb529467504106bcd055036ab00721","README.md":"809c88a6c70ec74eabc883e40f5be368890c1929f7575e49e38256cde671f813","src/describe.rs":"2eebe90d99919f4dbb5a2bb2c0113d7c74cc199ad78c2182bf7964ce6639deb0","src/lib.rs":"17f9751f585ae2bc1b16691a4834898b583508c0de8276fcb5cf1d6c4c045e92","src/spec/mod.rs":"669af4fa43750d52fb2b4e65bb0031a27396bae574df6e02c40839bb7558dcae","src/spec/parse/delegate.rs":"b00c2d9ab8fdea72200f7f781662bf07f31164cb8b5a9831824c8a8d9d0c2277","src/spec/parse/function.rs":"3446a5f372aeeda60e5cf1507bf9c8a25981b5f2d33afe7a3ce787f15f92043c","src/spec/parse/mod.rs":"a5a565d483088cd3a4a48cad09fa78f9eae2f18fd844ffb0b9fb0afd4bfd7617","src/types.rs":"62395bf474daf0a09a4de5c6d11e5b4354033b2f1fff2edcbd3b11d87841edc2"},"package":"810f35e9afeccca999d5d348b239f9c162353127d2e13ff3240e31b919e35476"}
\ No newline at end of file
diff --git a/vendor/gix-revision/CHANGELOG.md b/vendor/gix-revision/CHANGELOG.md
index 3a7d1e9a3..8df1aff19 100644
--- a/vendor/gix-revision/CHANGELOG.md
+++ b/vendor/gix-revision/CHANGELOG.md
@@ -5,6 +5,118 @@ 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.13.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/>
+
+ - 10 commits contributed to the release over the course of 14 calendar days.
+ - 25 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)
+
+### Thanks Clippy
+
+<csr-read-only-do-not-edit/>
+
+[Clippy](https://github.com/rust-lang/rust-clippy) helped 1 time to make code idiomatic. 
+
+### 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))
+    - Merge branch 'fix-823' ([`6ebd61e`](https://github.com/Byron/gitoxide/commit/6ebd61e548a36a04e413ac725a03e607a3588334))
+    - Thanks clippy ([`14e64e7`](https://github.com/Byron/gitoxide/commit/14e64e74649cfb1f2f99da87015939af98fae5c8))
+    - 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))
+    - Release gix-hash v0.10.4, gix-hashtable v0.1.3 ([`b574a39`](https://github.com/Byron/gitoxide/commit/b574a3904203762a6b9e475e16a7c358d7616599))
+</details>
+
+## 0.12.2 (2023-04-01)
+
+<csr-id-1c27e7a3745b156ea953e430f726576389fad5f2/>
+
+### Bug Fixes
+
+ - <csr-id-cfaab7ffc67d33224afe4b92e42059c0bb88ea02/> Parse revisions with `@` in their name.
+   Previously these would cause a parse error due to confusing `@` with
+   the short form of `HEAD`.
+   
+   Merge branch 'fix-rev-parse-with-at'
+
+### Other
+
+ - <csr-id-1c27e7a3745b156ea953e430f726576389fad5f2/> Parse revisions with the @ character
+   Fixes https://github.com/Byron/gitoxide/issues/802
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 4 commits contributed to the release.
+ - 6 days passed between releases.
+ - 2 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 1 unique issue was worked on: [#802](https://github.com/Byron/gitoxide/issues/802)
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **[#802](https://github.com/Byron/gitoxide/issues/802)**
+    - Parse revisions with `@` in their name. ([`cfaab7f`](https://github.com/Byron/gitoxide/commit/cfaab7ffc67d33224afe4b92e42059c0bb88ea02))
+ * **Uncategorized**
+    - Release gix-revision v0.12.2 ([`ec64a88`](https://github.com/Byron/gitoxide/commit/ec64a88690243a210efee6d5ae5164723e13f734))
+    - Refactor ([`c0905ce`](https://github.com/Byron/gitoxide/commit/c0905ce74f1bef4c42c9729e2bcf267d7aa6af5e))
+    - Parse revisions with the @ character ([`1c27e7a`](https://github.com/Byron/gitoxide/commit/1c27e7a3745b156ea953e430f726576389fad5f2))
+</details>
+
+## 0.12.1 (2023-03-26)
+
+A maintenance release without any user-facing changes.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release over the course of 3 calendar days.
+ - 21 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### Commit Details
+
+<csr-read-only-do-not-edit/>
+
+<details><summary>view details</summary>
+
+ * **Uncategorized**
+    - Release gix-tempfile v5.0.2, gix-validate v0.7.4, gix-config v0.20.0, gix-prompt v0.3.3, gix-diff v0.28.1, gix-discover v0.16.1, gix-pack v0.33.2, gix-transport v0.29.1, gix-protocol v0.30.1, gix-revision v0.12.1, gix-worktree v0.15.1, gix v0.43.0, safety bump gix v0.43.0 ([`5dc1f9f`](https://github.com/Byron/gitoxide/commit/5dc1f9f2bcb8b3e147115fcb6f76558e8f48ffef))
+    - Prepare changelogs prior to release ([`3016a28`](https://github.com/Byron/gitoxide/commit/3016a285f566bdfe7de2774fa6f2254c1b1a2c51))
+    - Correct more typos with `typos` tool. ([`2321eb9`](https://github.com/Byron/gitoxide/commit/2321eb971c2b89551506e2016a3495fafd15b47d))
+</details>
+
 ## 0.12.0 (2023-03-04)
 
 A maintenance release without user-facing changes.
@@ -13,7 +125,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 +137,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-revision/Cargo.toml b/vendor/gix-revision/Cargo.toml
index 56670c6bf..d8a43419f 100644
--- a/vendor/gix-revision/Cargo.toml
+++ b/vendor/gix-revision/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.64"
 name = "gix-revision"
-version = "0.12.0"
+version = "0.13.0"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 include = [
     "src/**/*",
@@ -47,16 +47,16 @@ version = "0.2.1"
 optional = true
 
 [dependencies.gix-date]
-version = "^0.4.3"
+version = "^0.5.0"
 
 [dependencies.gix-hash]
-version = "^0.10.3"
+version = "^0.11.1"
 
 [dependencies.gix-hashtable]
-version = "^0.1.2"
+version = "^0.2.0"
 
 [dependencies.gix-object]
-version = "^0.28.0"
+version = "^0.29.1"
 
 [dependencies.serde]
 version = "1.0.114"
@@ -68,8 +68,8 @@ default-features = false
 version = "1.0.26"
 
 [features]
-serde1 = [
-    "serde",
-    "gix-hash/serde1",
-    "gix-object/serde1",
+serde = [
+    "dep:serde",
+    "gix-hash/serde",
+    "gix-object/serde",
 ]
diff --git a/vendor/gix-revision/src/spec/mod.rs b/vendor/gix-revision/src/spec/mod.rs
index ba24c75c0..c2df7bc1e 100644
--- a/vendor/gix-revision/src/spec/mod.rs
+++ b/vendor/gix-revision/src/spec/mod.rs
@@ -1,11 +1,12 @@
 use crate::Spec;
 
 /// How to interpret a revision specification, or `revspec`.
-#[derive(Debug, Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Default, Debug, Copy, Clone, PartialOrd, PartialEq, Ord, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Kind {
     /// Include commits reachable from this revision, the default when parsing revision `a` for example, i.e. `a` and its ancestors.
     /// Example: `a`.
+    #[default]
     IncludeReachable,
     /// Exclude commits reachable from this revision, i.e. `a` and its ancestors. Example: `^a`.
     ExcludeReachable,
@@ -19,12 +20,6 @@ pub enum Kind {
     ExcludeReachableFromParents,
 }
 
-impl Default for Kind {
-    fn default() -> Self {
-        Kind::IncludeReachable
-    }
-}
-
 impl Spec {
     /// Return the kind of this specification.
     pub fn kind(&self) -> Kind {
diff --git a/vendor/gix-revision/src/spec/parse/function.rs b/vendor/gix-revision/src/spec/parse/function.rs
index 4b12344c7..94fb4ee5d 100644
--- a/vendor/gix-revision/src/spec/parse/function.rs
+++ b/vendor/gix-revision/src/spec/parse/function.rs
@@ -344,8 +344,19 @@ where
     {
         let mut cursor = input;
         let mut ofs = 0;
-        while let Some((pos, b)) = cursor.iter().enumerate().find(|(_, b)| {
-            if b"@~^:.".contains(b) {
+        const SEPARATORS: &[u8] = b"~^:.";
+        while let Some((pos, b)) = cursor.iter().enumerate().find(|(pos, b)| {
+            if **b == b'@' {
+                if cursor.len() == 1 {
+                    return true;
+                }
+                let next = cursor.get(pos + 1);
+                let next_next = cursor.get(pos + 2);
+                if *pos != 0 && (next, next_next) == (Some(&b'.'), Some(&b'.')) {
+                    return false;
+                }
+                next == Some(&b'{') || next.map_or(false, |b| SEPARATORS.contains(b))
+            } else if SEPARATORS.contains(b) {
                 true
             } else {
                 if let Some(num) = consecutive_hex_chars.as_mut() {
diff --git a/vendor/gix-revision/src/types.rs b/vendor/gix-revision/src/types.rs
index 43b0caf97..374d43e20 100644
--- a/vendor/gix-revision/src/types.rs
+++ b/vendor/gix-revision/src/types.rs
@@ -3,7 +3,7 @@
 /// Note that all [object ids][gix_hash::ObjectId] should be a committish, but don't have to be.
 /// Unless the field name contains `_exclusive`, the respective objects are included in the set.
 #[derive(Copy, Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum Spec {
     /// Include commits reachable from this revision, i.e. `a` and its ancestors.
     ///