From 28f712e97ebd805cbcffe184203c9089248b0ca8 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Thu, 23 Jan 2025 10:41:16 +0100
Subject: [PATCH] adapt to changes in `gix-command`
---
gix-credentials/src/program/mod.rs | 4 ++--
gix-diff/src/blob/pipeline.rs | 2 +-
gix-filter/src/driver/init.rs | 2 +-
gix-merge/src/blob/platform/merge.rs | 2 +-
gix-transport/src/client/blocking_io/ssh/mod.rs | 2 +-
gix-transport/src/client/blocking_io/ssh/program_kind.rs | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gix-credentials/src/program/mod.rs b/gix-credentials/src/program/mod.rs
index 2d216044997..a966ca622f5 100644
--- a/gix-credentials/src/program/mod.rs
+++ b/gix-credentials/src/program/mod.rs
@@ -82,14 +82,14 @@ impl Program {
args.insert_str(0, git_program.to_string_lossy().as_ref());
gix_command::prepare(gix_path::from_bstr(args.as_bstr()).into_owned())
.arg(action.as_arg(true))
- .with_shell_allow_manual_argument_splitting()
+ .command_may_be_shell_script_allow_manual_argument_splitting()
.into()
}
Kind::ExternalShellScript(for_shell)
| Kind::ExternalPath {
path_and_args: for_shell,
} => gix_command::prepare(gix_path::from_bstr(for_shell.as_bstr()).as_ref())
- .with_shell()
+ .command_may_be_shell_script()
.arg(action.as_arg(true))
.into(),
};
diff --git a/gix-diff/src/blob/pipeline.rs b/gix-diff/src/blob/pipeline.rs
index 9f7f342de11..6ad308e7223 100644
--- a/gix-diff/src/blob/pipeline.rs
+++ b/gix-diff/src/blob/pipeline.rs
@@ -543,7 +543,7 @@ impl Driver {
let cmd = gix_command::prepare(gix_path::from_bstr(command).into_owned())
// TODO: Add support for an actual Context, validate it *can* match Git
.with_context(Default::default())
- .with_shell()
+ .command_may_be_shell_script()
.stdin(Stdio::null())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
diff --git a/gix-filter/src/driver/init.rs b/gix-filter/src/driver/init.rs
index 616d4d7193b..2083098f16b 100644
--- a/gix-filter/src/driver/init.rs
+++ b/gix-filter/src/driver/init.rs
@@ -92,7 +92,7 @@ fn spawn_driver(
context: &gix_command::Context,
) -> Result<(std::process::Child, std::process::Command), Error> {
let mut cmd: std::process::Command = gix_command::prepare(gix_path::from_bstr(cmd).into_owned())
- .with_shell()
+ .command_may_be_shell_script()
.with_context(context.clone())
.stdin(Stdio::piped())
.stdout(Stdio::piped())
diff --git a/gix-merge/src/blob/platform/merge.rs b/gix-merge/src/blob/platform/merge.rs
index 45e6d052251..058a301287c 100644
--- a/gix-merge/src/blob/platform/merge.rs
+++ b/gix-merge/src/blob/platform/merge.rs
@@ -214,7 +214,7 @@ pub(super) mod inner {
Ok(merge::Command {
cmd: gix_command::prepare(gix_path::from_bstring(cmd))
.with_context(context)
- .with_shell()
+ .command_may_be_shell_script()
.stdin(Stdio::null())
.stdout(Stdio::inherit())
.stderr(Stdio::inherit())
diff --git a/gix-transport/src/client/blocking_io/ssh/mod.rs b/gix-transport/src/client/blocking_io/ssh/mod.rs
index 737543b87ab..21680031712 100644
--- a/gix-transport/src/client/blocking_io/ssh/mod.rs
+++ b/gix-transport/src/client/blocking_io/ssh/mod.rs
@@ -116,7 +116,7 @@ pub fn connect(
.stderr(Stdio::null())
.stdout(Stdio::null())
.stdin(Stdio::null())
- .with_shell()
+ .command_may_be_shell_script()
.arg("-G")
.arg(match url.host_as_argument() {
Usable(host) => host,
diff --git a/gix-transport/src/client/blocking_io/ssh/program_kind.rs b/gix-transport/src/client/blocking_io/ssh/program_kind.rs
index 36801fa5fa7..a9a5898a127 100644
--- a/gix-transport/src/client/blocking_io/ssh/program_kind.rs
+++ b/gix-transport/src/client/blocking_io/ssh/program_kind.rs
@@ -29,7 +29,7 @@ impl ProgramKind {
desired_version: Protocol,
disallow_shell: bool,
) -> Result<gix_command::Prepare, ssh::invocation::Error> {
- let mut prepare = gix_command::prepare(ssh_cmd).with_shell();
+ let mut prepare = gix_command::prepare(ssh_cmd).command_may_be_shell_script();
if disallow_shell {
prepare.use_shell = false;
}