Merging upstream version 1.75.0+dfsg1.

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

5 files changed, 40 insertions, 8 deletions

diff --git a/vendor/gix-pathspec/.cargo-checksum.json b/vendor/gix-pathspec/.cargo-checksum.json
index 776151660..a97967184 100644
--- a/vendor/gix-pathspec/.cargo-checksum.json
+++ b/vendor/gix-pathspec/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"e260578f0c5595ab2d17eddd0309da451ee37752b8ec31c09193670c5f6dfe6e","Cargo.toml":"bdb90604393782c6ea835edad435a65ccff130a667fed4471b7bc6edf9bca307","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","README.md":"ec95cf838fbde2a636e2b1de88ddde926ddbc59b496590d7a8edbd283d87875f","src/defaults.rs":"ff76c0704678059c26924f729c36f40c501d21cb0afa793359a73e67a0f2e736","src/lib.rs":"74f77299f99c32714396a2815e014474af44414941786a82cc1a3be930d47a9d","src/parse.rs":"c279f433b8585447c2f6e1d02329f8a2eb86694333b2dd6af45fedbb1faef724","src/pattern.rs":"629c3225eb83eb9e3606eeda558f8e66c12defacc99f95f00e177308322bb576","src/search/init.rs":"a26f6335f8feb7c8feac0390c07da0b64499d5a7a7d3f263149ddfe678025356","src/search/matching.rs":"e9529ca5c88762f19c890a5f210339d4b1febe8fc6633eb6f1b2d69367855d93","src/search/mod.rs":"31a3b65392c3791cb9b66f8a799275ba5d4b13a0e82bd1401bbb114cd3357ef0","tests/defaults.rs":"fb9e0c78258e96f89138e77f1d9fbb009de2ff490a3c2ecd0637e826a105dd69","tests/fixtures/generated-archives/match_baseline.tar.xz":"0ba46801dfab65bcc77c8ce0dc9144d77fd142be847f3340af6ae8fcba44c82d","tests/fixtures/generated-archives/match_baseline_dirs.tar.xz":"742241f4ea290fc9088fd5e32423859929bc4b39dccd31d205c67fe3ac9128c0","tests/fixtures/generated-archives/match_baseline_files.tar.xz":"b0c722ab08de2ab63b9f222747cf898f5b6bb6b76ec55ccd176bab3b854ef7bb","tests/fixtures/generated-archives/parse_baseline.tar.xz":"123da727b33802a3a2dc80e948b07cbf133c2d66129693f4896cba2f6b92b02f","tests/fixtures/match_baseline_dirs.sh":"202f2d67ed9107507e4c648b2ad78934ea2a3f6b6865f0a8367fe7aa6aca7614","tests/fixtures/match_baseline_files.sh":"3fa45af77c32b570c419b9746539ee9f074e13113437f5a29931126b155cb1ff","tests/fixtures/parse_baseline.sh":"55415e80ce66bce46bf342036b7fd6e8a3a9094cb058cade13af325347e8bb73","tests/normalize/mod.rs":"6d39e550b255da354b1566f01d21f270b5235bbae760448ceec734cef3930569","tests/parse/invalid.rs":"7bc793a7718a46fd08c2de87d971cdc044788d9df8c6499ca4e3022caed6d955","tests/parse/mod.rs":"e712b38cc012ff5775a9ff60c1a6f70a7c2411dad42ae5e496068db71b1565d4","tests/parse/valid.rs":"ab1f68baaeaef7d6320304117e39531e78d36ec038f78a74d49f82ac66675950","tests/pathspec.rs":"63ed83deae59a91ba60b36ffccebd5ea01229eb20a10f654595441f511dea14f","tests/search/mod.rs":"b701d3431edb87032bc85b0375cd47050210af7ab438f598c71733ad41558d97"},"package":"c3e26c9b47c51be73f98d38c84494bd5fb99334c5d6fda14ef5d036d50a9e5fd"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"9bdb992f7380e018fb6f96a4c72fa0acaf0199f66fdbf32ecaeba65ab1e5c25d","Cargo.toml":"93c707a0881ec751086ce00043ada23b7e4d660a684bafe2c53da921720bcfc3","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","README.md":"ec95cf838fbde2a636e2b1de88ddde926ddbc59b496590d7a8edbd283d87875f","src/defaults.rs":"ff76c0704678059c26924f729c36f40c501d21cb0afa793359a73e67a0f2e736","src/lib.rs":"489131bfe45d9040a4b8283c94eb7f423216de2e492b29762c008d5258e04177","src/parse.rs":"c279f433b8585447c2f6e1d02329f8a2eb86694333b2dd6af45fedbb1faef724","src/pattern.rs":"629c3225eb83eb9e3606eeda558f8e66c12defacc99f95f00e177308322bb576","src/search/init.rs":"a26f6335f8feb7c8feac0390c07da0b64499d5a7a7d3f263149ddfe678025356","src/search/matching.rs":"e9529ca5c88762f19c890a5f210339d4b1febe8fc6633eb6f1b2d69367855d93","src/search/mod.rs":"31a3b65392c3791cb9b66f8a799275ba5d4b13a0e82bd1401bbb114cd3357ef0","tests/defaults.rs":"fb9e0c78258e96f89138e77f1d9fbb009de2ff490a3c2ecd0637e826a105dd69","tests/fixtures/generated-archives/match_baseline.tar.xz":"0ba46801dfab65bcc77c8ce0dc9144d77fd142be847f3340af6ae8fcba44c82d","tests/fixtures/generated-archives/match_baseline_dirs.tar.xz":"742241f4ea290fc9088fd5e32423859929bc4b39dccd31d205c67fe3ac9128c0","tests/fixtures/generated-archives/match_baseline_files.tar.xz":"b0c722ab08de2ab63b9f222747cf898f5b6bb6b76ec55ccd176bab3b854ef7bb","tests/fixtures/generated-archives/parse_baseline.tar.xz":"123da727b33802a3a2dc80e948b07cbf133c2d66129693f4896cba2f6b92b02f","tests/fixtures/match_baseline_dirs.sh":"202f2d67ed9107507e4c648b2ad78934ea2a3f6b6865f0a8367fe7aa6aca7614","tests/fixtures/match_baseline_files.sh":"3fa45af77c32b570c419b9746539ee9f074e13113437f5a29931126b155cb1ff","tests/fixtures/parse_baseline.sh":"55415e80ce66bce46bf342036b7fd6e8a3a9094cb058cade13af325347e8bb73","tests/normalize/mod.rs":"6d39e550b255da354b1566f01d21f270b5235bbae760448ceec734cef3930569","tests/parse/invalid.rs":"7bc793a7718a46fd08c2de87d971cdc044788d9df8c6499ca4e3022caed6d955","tests/parse/mod.rs":"e712b38cc012ff5775a9ff60c1a6f70a7c2411dad42ae5e496068db71b1565d4","tests/parse/valid.rs":"ab1f68baaeaef7d6320304117e39531e78d36ec038f78a74d49f82ac66675950","tests/pathspec.rs":"63ed83deae59a91ba60b36ffccebd5ea01229eb20a10f654595441f511dea14f","tests/search/mod.rs":"2540ce1fc004bdcc355ca2a0e3dbcb22c943e209f93c311e2be3a04f8f1855b5"},"package":"e9cc7194fdcf43b4a1ccfa13ffae1d79f83beb4becff7761d88dd99faeafe625"}
\ No newline at end of file
diff --git a/vendor/gix-pathspec/CHANGELOG.md b/vendor/gix-pathspec/CHANGELOG.md
index d742565d3..ffced1757 100644
--- a/vendor/gix-pathspec/CHANGELOG.md
+++ b/vendor/gix-pathspec/CHANGELOG.md
@@ -5,6 +5,37 @@ 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.4.0 (2023-10-12)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 3 commits contributed to the release over the course of 6 calendar days.
+ - 17 days passed between releases.
+ - 0 commits were understood as [conventional](https://www.conventionalcommits.org).
+ - 0 issues like '(#ID)' were seen in commit messages
+
+### 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>
+
+ * **Uncategorized**
+    - Prepare changelogs prior to release ([`1347a54`](https://github.com/Byron/gitoxide/commit/1347a54f84599d8f0aa935d6e64b16c2298d25cf))
+    - Fix docs ([`995bc84`](https://github.com/Byron/gitoxide/commit/995bc840664cbd4aeb7f95592e3125dee63bdcd4))
+    - Thanks clippy ([`345712d`](https://github.com/Byron/gitoxide/commit/345712dcdfddcccc630bbfef2ed4f461b21550d3))
+</details>
+
 ## 0.3.0 (2023-09-24)
 
 <csr-id-832b34570bde97499e75a174bc818113092b3145/>
@@ -17,7 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 3 commits contributed to the release over the course of 1 calendar day.
+ - 4 commits contributed to the release over the course of 1 calendar day.
  - 16 days passed between releases.
  - 1 commit was understood as [conventional](https://www.conventionalcommits.org).
  - 0 issues like '(#ID)' were seen in commit messages
@@ -29,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release gix-features v0.35.0, gix-actor v0.27.0, gix-object v0.37.0, gix-glob v0.13.0, gix-attributes v0.19.0, gix-filter v0.5.0, gix-fs v0.7.0, gix-commitgraph v0.21.0, gix-revwalk v0.8.0, gix-traverse v0.33.0, gix-worktree-stream v0.5.0, gix-archive v0.5.0, gix-tempfile v10.0.0, gix-lock v10.0.0, gix-ref v0.37.0, gix-config v0.30.0, gix-url v0.24.0, gix-credentials v0.20.0, gix-diff v0.36.0, gix-discover v0.25.0, gix-ignore v0.8.0, gix-index v0.25.0, gix-mailmap v0.19.0, gix-negotiate v0.8.0, gix-pack v0.43.0, gix-odb v0.53.0, gix-pathspec v0.3.0, gix-transport v0.37.0, gix-protocol v0.40.0, gix-revision v0.22.0, gix-refspec v0.18.0, gix-status v0.1.0, gix-submodule v0.4.0, gix-worktree v0.26.0, gix-worktree-state v0.3.0, gix v0.54.0, gitoxide-core v0.32.0, gitoxide v0.30.0, safety bump 37 crates ([`7891fb1`](https://github.com/Byron/gitoxide/commit/7891fb17348ec2f4c997665f9a25be36e2713da4))
     - Prepare changelogs prior to release ([`8a60d5b`](https://github.com/Byron/gitoxide/commit/8a60d5b80877c213c3b646d3061e8a33e0e433ec))
     - Merge branch 'reset' ([`54a8495`](https://github.com/Byron/gitoxide/commit/54a849545140f7f1c0c7564c418071c0a76a34e7))
     - Improve documentation of `common_prefix()` and `pattern_matching_relative_path()`. ([`832b345`](https://github.com/Byron/gitoxide/commit/832b34570bde97499e75a174bc818113092b3145))
diff --git a/vendor/gix-pathspec/Cargo.toml b/vendor/gix-pathspec/Cargo.toml
index 57527a4f4..ba6e987c9 100644
--- a/vendor/gix-pathspec/Cargo.toml
+++ b/vendor/gix-pathspec/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.65"
 name = "gix-pathspec"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 description = "A crate of the gitoxide project dealing magical pathspecs"
 readme = "README.md"
@@ -32,13 +32,13 @@ features = ["std"]
 default-features = false
 
 [dependencies.gix-attributes]
-version = "^0.19.0"
+version = "^0.20.0"
 
 [dependencies.gix-config-value]
 version = "^0.14.0"
 
 [dependencies.gix-glob]
-version = "^0.13.0"
+version = "^0.14.0"
 
 [dependencies.gix-path]
 version = "^0.10.0"
diff --git a/vendor/gix-pathspec/src/lib.rs b/vendor/gix-pathspec/src/lib.rs
index 9f91567da..e271cdb06 100644
--- a/vendor/gix-pathspec/src/lib.rs
+++ b/vendor/gix-pathspec/src/lib.rs
@@ -134,7 +134,7 @@ pub enum SearchMode {
     PathAwareGlob,
 }
 
-/// Parse a git-style pathspec into a [`Pattern`][Pattern],
+/// Parse a git-style pathspec into a [`Pattern`],
 /// setting the given `default` values in case these aren't specified in `input`.
 ///
 /// Note that empty [paths](Pattern::path) are allowed here, and generally some processing has to be performed.
diff --git a/vendor/gix-pathspec/tests/search/mod.rs b/vendor/gix-pathspec/tests/search/mod.rs
index 638709c35..5266f3d0c 100644
--- a/vendor/gix-pathspec/tests/search/mod.rs
+++ b/vendor/gix-pathspec/tests/search/mod.rs
@@ -219,8 +219,8 @@ mod baseline {
                         is_inconsistent = spec.as_bstr() == "git-inconsistency";
                         !is_inconsistent
                     })
-                    .filter_map(|s| (!s.trim().is_empty()).then(|| s.trim()))
-                    .map(|pathspec| gix_pathspec::parse(pathspec, Default::default()).expect("valid pathspec"))
+                    .filter(|s| !s.trim().is_empty())
+                    .map(|pathspec| gix_pathspec::parse(pathspec.trim(), Default::default()).expect("valid pathspec"))
                     .collect();
                 Expected {
                     pathspecs,