Merging upstream version 1.75.0+dfsg1.

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

4 files changed, 36 insertions, 15 deletions

diff --git a/vendor/gix-command/.cargo-checksum.json b/vendor/gix-command/.cargo-checksum.json
index 30a5bed6a..10887293e 100644
--- a/vendor/gix-command/.cargo-checksum.json
+++ b/vendor/gix-command/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"b54be458a722939f06aee80930d67da1fc7e3abe47c088f3ae49940ef734f93f","Cargo.toml":"1e626d8f563e16ed17ee17d09552802908bfbd1fc35dd9c22e982bfcce53beeb","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","src/lib.rs":"a8149c52abe2f2c2f9883a816ceff553bd67eff1e05aae591df0a12edcbbbbd9","tests/command.rs":"d863fefac90fd9a11f2d26b557f3db98612c49e2df51a5eba3774d47852ca15f"},"package":"0f28f654184b5f725c5737c7e4f466cbd8f0102ac352d5257eeab19647ee4256"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"b8107f9d62dab5b15c41cbf5805f2b29c35087f4c680fe898876f3afd8ed5096","Cargo.toml":"ede3b6a8e18bd482082cc4cff39f1043b8101099b2f399d8401e27f03412f864","LICENSE-APACHE":"cb4780590812826851ba250f90bed0ed19506ec98f6865a0e2e20bbf62391ff9","LICENSE-MIT":"49df47913ab2beafe8dc45607877ae64198bf0eee64aaad3e82ed9e4d27424e8","src/lib.rs":"a8149c52abe2f2c2f9883a816ceff553bd67eff1e05aae591df0a12edcbbbbd9","tests/command.rs":"0005efdd3ab1ebe627ee2ba03f079c1f8cc3af98c558bbdf65efe4b0ed458b7b"},"package":"3c576cfbf577f72c097b5f88aedea502cd62952bdc1fb3adcab4531d5525a4c7"}
\ No newline at end of file
diff --git a/vendor/gix-command/CHANGELOG.md b/vendor/gix-command/CHANGELOG.md
index 08269436c..1eb9447f7 100644
--- a/vendor/gix-command/CHANGELOG.md
+++ b/vendor/gix-command/CHANGELOG.md
@@ -5,6 +5,32 @@ 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.2.10 (2023-10-12)
+
+A maintenance release without user-facing changes.
+
+### Commit Statistics
+
+<csr-read-only-do-not-edit/>
+
+ - 4 commits contributed to the release over the course of 51 calendar days.
+ - 51 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**
+    - Prepare changelogs prior to release ([`1347a54`](https://github.com/Byron/gitoxide/commit/1347a54f84599d8f0aa935d6e64b16c2298d25cf))
+    - Merge branch 'reset' ([`b842691`](https://github.com/Byron/gitoxide/commit/b8426919a491dc3a7df01ee3f258fc0d8a3a327c))
+    - Fix gix-command tests on windows ([`67a0220`](https://github.com/Byron/gitoxide/commit/67a0220dc4c4ff6f79a24771fb175baec22bc6b0))
+    - Merge branch 'gix-submodule' ([`363ee77`](https://github.com/Byron/gitoxide/commit/363ee77400805f473c9ad66eadad9214e7ab66f4))
+</details>
+
 ## 0.2.9 (2023-08-22)
 
 <csr-id-229bd4899213f749a7cc124aa2b82a1368fba40f/>
@@ -17,7 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <csr-read-only-do-not-edit/>
 
- - 4 commits contributed to the release over the course of 18 calendar days.
+ - 5 commits contributed to the release over the course of 18 calendar days.
  - 30 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 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <details><summary>view details</summary>
 
  * **Uncategorized**
+    - Release gix-date v0.7.3, gix-hash v0.12.0, gix-features v0.33.0, gix-actor v0.25.0, gix-object v0.35.0, gix-path v0.9.0, gix-glob v0.11.0, gix-quote v0.4.7, gix-attributes v0.17.0, gix-command v0.2.9, gix-packetline-blocking v0.16.5, gix-filter v0.3.0, gix-fs v0.5.0, gix-commitgraph v0.19.0, gix-hashtable v0.3.0, gix-revwalk v0.6.0, gix-traverse v0.31.0, gix-worktree-stream v0.3.0, gix-archive v0.3.0, gix-config-value v0.13.0, gix-tempfile v8.0.0, gix-lock v8.0.0, gix-ref v0.35.0, gix-sec v0.9.0, gix-config v0.28.0, gix-prompt v0.6.0, gix-url v0.22.0, gix-credentials v0.18.0, gix-diff v0.34.0, gix-discover v0.23.0, gix-ignore v0.6.0, gix-bitmap v0.2.7, gix-index v0.22.0, gix-mailmap v0.17.0, gix-negotiate v0.6.0, gix-pack v0.41.0, gix-odb v0.51.0, gix-pathspec v0.1.0, gix-packetline v0.16.5, gix-transport v0.35.0, gix-protocol v0.38.0, gix-revision v0.20.0, gix-refspec v0.16.0, gix-submodule v0.2.0, gix-worktree v0.24.0, gix-worktree-state v0.1.0, gix v0.52.0, gitoxide-core v0.31.0, gitoxide v0.29.0, safety bump 41 crates ([`30b2761`](https://github.com/Byron/gitoxide/commit/30b27615047692d3ced1b2d9c2ac15a80f79fbee))
     - Update changelogs prior to release ([`f23ea88`](https://github.com/Byron/gitoxide/commit/f23ea8828f2d9ba7559973daca388c9591bcc5fc))
     - Don't call crate 'WIP' in manifest anymore. ([`229bd48`](https://github.com/Byron/gitoxide/commit/229bd4899213f749a7cc124aa2b82a1368fba40f))
     - Merge branch 'dev-on-linux' ([`6b4a303`](https://github.com/Byron/gitoxide/commit/6b4a30330fe49fc97daa73f55bf56580cc0597aa))
diff --git a/vendor/gix-command/Cargo.toml b/vendor/gix-command/Cargo.toml
index 163a5bc90..4d0a4e186 100644
--- a/vendor/gix-command/Cargo.toml
+++ b/vendor/gix-command/Cargo.toml
@@ -13,7 +13,7 @@
 edition = "2021"
 rust-version = "1.65"
 name = "gix-command"
-version = "0.2.9"
+version = "0.2.10"
 authors = ["Sebastian Thiel <sebastian.thiel@icloud.com>"]
 description = "A crate of the gitoxide project handling internal git command execution"
 license = "MIT OR Apache-2.0"
diff --git a/vendor/gix-command/tests/command.rs b/vendor/gix-command/tests/command.rs
index e2faa7fc9..606066da1 100644
--- a/vendor/gix-command/tests/command.rs
+++ b/vendor/gix-command/tests/command.rs
@@ -82,32 +82,26 @@ mod spawn {
 
         #[test]
         fn sh_shell_specific_script_code_with_single_extra_arg() -> crate::Result {
-            let out = gix_command::prepare("echo")
+            let out = gix_command::prepare("printf")
                 .with_shell()
                 .arg("1")
                 .spawn()?
                 .wait_with_output()?;
             assert!(out.status.success());
-            #[cfg(not(windows))]
-            assert_eq!(out.stdout.as_bstr(), "1\n");
-            #[cfg(windows)]
-            assert_eq!(out.stdout.as_bstr(), "1\r\n");
+            assert_eq!(out.stdout.as_bstr(), "1");
             Ok(())
         }
 
         #[test]
         fn sh_shell_specific_script_code_with_multiple_extra_args() -> crate::Result {
-            let out = gix_command::prepare("echo")
+            let out = gix_command::prepare("printf")
                 .with_shell()
-                .arg("1")
-                .arg("2")
+                .arg("%s")
+                .arg("arg")
                 .spawn()?
                 .wait_with_output()?;
             assert!(out.status.success());
-            #[cfg(not(windows))]
-            assert_eq!(out.stdout.as_bstr(), "1 2\n");
-            #[cfg(windows)]
-            assert_eq!(out.stdout.as_bstr(), "1 2\r\n");
+            assert_eq!(out.stdout.as_bstr(), "arg");
             Ok(())
         }
     }