Merge pull request #2087 from GitoxideLabs/improvements

fix: `Prepare::with_shell()` now assures manual argument splitting isn't done on Windows either.

Author: Byron

gix-command/src/lib.rs

@@ -134,8 +134,13 @@ mod prepare {
         /// commands are always executed verbatim and directly, without the use of a shell. (But
         /// see [`command_may_be_shell_script()`](Self::command_may_be_shell_script()) on other
         /// methods that call that method.)
+        ///
+        /// We also disallow manual argument splitting
+        /// (see [`command_may_be_shell_script_disallow_manual_argument_splitting`](Self::command_may_be_shell_script_disallow_manual_argument_splitting()))
+        /// to assure a shell is indeed used, no matter what.
         pub fn with_shell(mut self) -> Self {
             self.use_shell = true;
+            self.allow_manual_arg_splitting = false;
             self
         }
 

gix-command/tests/command.rs

@@ -319,7 +319,7 @@ mod prepare {
                 let sh = *SH;
                 format!(r#""{sh}" "-c" "ls --foo \"a b\" \"$@\"" "--" "additional""#)
             },
-            "with shell, this works as it performs word splitting"
+            "with shell, this works as it performs word splitting, on windows we can avoid the shell"
         );
     }
 
@@ -345,12 +345,7 @@ mod prepare {
 
     #[test]
     fn single_and_simple_arguments_without_auto_split_with_shell() {
-        let cmd = std::process::Command::from(
-            gix_command::prepare("ls")
-                .arg("--foo=a b")
-                .command_may_be_shell_script_disallow_manual_argument_splitting()
-                .with_shell(),
-        );
+        let cmd = std::process::Command::from(gix_command::prepare("ls").arg("--foo=a b").with_shell());
         assert_eq!(
             format!("{cmd:?}"),
             quoted(&[*SH, "-c", r#"ls \"$@\""#, "--", "--foo=a b"])
@@ -362,7 +357,6 @@ mod prepare {
         let cmd = std::process::Command::from(
             gix_command::prepare("ls")
                 .arg("--foo=a b")
-                .command_may_be_shell_script_disallow_manual_argument_splitting()
                 .with_shell()
                 .with_quoted_command(),
         );
@@ -378,7 +372,6 @@ mod prepare {
         let cmd = std::process::Command::from(
             gix_command::prepare(r"C:\Users\O'Shaughnessy\with space.exe")
                 .arg("--foo='a b'")
-                .command_may_be_shell_script_disallow_manual_argument_splitting()
                 .with_shell()
                 .with_quoted_command(),
         );