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
6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -82,14 +82,14 @@ impl Program {
82
82
args. insert_str ( 0 , git_program. to_string_lossy ( ) . as_ref ( ) ) ;
83
83
gix_command:: prepare ( gix_path:: from_bstr ( args. as_bstr ( ) ) . into_owned ( ) )
84
84
. arg ( action. as_arg ( true ) )
85
- . with_shell_allow_manual_argument_splitting ( )
85
+ . command_may_be_shell_script_allow_manual_argument_splitting ( )
86
86
. into ( )
87
87
}
88
88
Kind :: ExternalShellScript ( for_shell)
89
89
| Kind :: ExternalPath {
90
90
path_and_args : for_shell,
91
91
} => gix_command:: prepare ( gix_path:: from_bstr ( for_shell. as_bstr ( ) ) . as_ref ( ) )
92
- . with_shell ( )
92
+ . command_may_be_shell_script ( )
93
93
. arg ( action. as_arg ( true ) )
94
94
. into ( ) ,
95
95
} ;
Original file line number Diff line number Diff line change @@ -543,7 +543,7 @@ impl Driver {
543
543
let cmd = gix_command:: prepare ( gix_path:: from_bstr ( command) . into_owned ( ) )
544
544
// TODO: Add support for an actual Context, validate it *can* match Git
545
545
. with_context ( Default :: default ( ) )
546
- . with_shell ( )
546
+ . command_may_be_shell_script ( )
547
547
. stdin ( Stdio :: null ( ) )
548
548
. stdout ( Stdio :: piped ( ) )
549
549
. stderr ( Stdio :: piped ( ) )
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ fn spawn_driver(
92
92
context : & gix_command:: Context ,
93
93
) -> Result < ( std:: process:: Child , std:: process:: Command ) , Error > {
94
94
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 ( )
96
96
. with_context ( context. clone ( ) )
97
97
. stdin ( Stdio :: piped ( ) )
98
98
. stdout ( Stdio :: piped ( ) )
Original file line number Diff line number Diff line change @@ -214,7 +214,7 @@ pub(super) mod inner {
214
214
Ok ( merge:: Command {
215
215
cmd : gix_command:: prepare ( gix_path:: from_bstring ( cmd) )
216
216
. with_context ( context)
217
- . with_shell ( )
217
+ . command_may_be_shell_script ( )
218
218
. stdin ( Stdio :: null ( ) )
219
219
. stdout ( Stdio :: inherit ( ) )
220
220
. stderr ( Stdio :: inherit ( ) )
Original file line number Diff line number Diff line change @@ -116,7 +116,7 @@ pub fn connect(
116
116
. stderr ( Stdio :: null ( ) )
117
117
. stdout ( Stdio :: null ( ) )
118
118
. stdin ( Stdio :: null ( ) )
119
- . with_shell ( )
119
+ . command_may_be_shell_script ( )
120
120
. arg ( "-G" )
121
121
. arg ( match url. host_as_argument ( ) {
122
122
Usable ( host) => host,
Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ impl ProgramKind {
29
29
desired_version : Protocol ,
30
30
disallow_shell : bool ,
31
31
) -> 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 ( ) ;
33
33
if disallow_shell {
34
34
prepare. use_shell = false ;
35
35
}
You can’t perform that action at this time.
0 commit comments