File tree Expand file tree Collapse file tree 6 files changed +7
-7
lines changed
gix-credentials/src/program
gix-merge/src/blob/platform
gix-transport/src/client/blocking_io/ssh Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -82,14 +82,14 @@ impl Program {
8282 args. insert_str ( 0 , git_program. to_string_lossy ( ) . as_ref ( ) ) ;
8383 gix_command:: prepare ( gix_path:: from_bstr ( args. as_bstr ( ) ) . into_owned ( ) )
8484 . arg ( action. as_arg ( true ) )
85- . with_shell_allow_manual_argument_splitting ( )
85+ . command_may_be_shell_script_allow_manual_argument_splitting ( )
8686 . into ( )
8787 }
8888 Kind :: ExternalShellScript ( for_shell)
8989 | Kind :: ExternalPath {
9090 path_and_args : for_shell,
9191 } => gix_command:: prepare ( gix_path:: from_bstr ( for_shell. as_bstr ( ) ) . as_ref ( ) )
92- . with_shell ( )
92+ . command_may_be_shell_script ( )
9393 . arg ( action. as_arg ( true ) )
9494 . into ( ) ,
9595 } ;
Original file line number Diff line number Diff line change @@ -543,7 +543,7 @@ impl Driver {
543543 let cmd = gix_command:: prepare ( gix_path:: from_bstr ( command) . into_owned ( ) )
544544 // TODO: Add support for an actual Context, validate it *can* match Git
545545 . with_context ( Default :: default ( ) )
546- . with_shell ( )
546+ . command_may_be_shell_script ( )
547547 . stdin ( Stdio :: null ( ) )
548548 . stdout ( Stdio :: piped ( ) )
549549 . stderr ( Stdio :: piped ( ) )
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ fn spawn_driver(
9292 context : & gix_command:: Context ,
9393) -> Result < ( std:: process:: Child , std:: process:: Command ) , Error > {
9494 let mut cmd: std:: process:: Command = gix_command:: prepare ( gix_path:: from_bstr ( cmd) . into_owned ( ) )
95- . with_shell ( )
95+ . command_may_be_shell_script ( )
9696 . with_context ( context. clone ( ) )
9797 . stdin ( Stdio :: piped ( ) )
9898 . stdout ( Stdio :: piped ( ) )
Original file line number Diff line number Diff line change @@ -214,7 +214,7 @@ pub(super) mod inner {
214214 Ok ( merge:: Command {
215215 cmd : gix_command:: prepare ( gix_path:: from_bstring ( cmd) )
216216 . with_context ( context)
217- . with_shell ( )
217+ . command_may_be_shell_script ( )
218218 . stdin ( Stdio :: null ( ) )
219219 . stdout ( Stdio :: inherit ( ) )
220220 . stderr ( Stdio :: inherit ( ) )
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ pub fn connect(
116116 . stderr ( Stdio :: null ( ) )
117117 . stdout ( Stdio :: null ( ) )
118118 . stdin ( Stdio :: null ( ) )
119- . with_shell ( )
119+ . command_may_be_shell_script ( )
120120 . arg ( "-G" )
121121 . arg ( match url. host_as_argument ( ) {
122122 Usable ( host) => host,
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ impl ProgramKind {
2929 desired_version : Protocol ,
3030 disallow_shell : bool ,
3131 ) -> Result < gix_command:: Prepare , ssh:: invocation:: Error > {
32- let mut prepare = gix_command:: prepare ( ssh_cmd) . with_shell ( ) ;
32+ let mut prepare = gix_command:: prepare ( ssh_cmd) . command_may_be_shell_script ( ) ;
3333 if disallow_shell {
3434 prepare. use_shell = false ;
3535 }
You can’t perform that action at this time.
0 commit comments