windows: Fix semantic merge conflict with ShellKind::new (#40107)

Release Notes: - N/A
2025-10-13 14:30:40 +00:00
parent f1db1f3a3c
commit dac5725246
3 changed files with 5 additions and 5 deletions
@@ -355,10 +355,10 @@ impl Shell {
        }
    }

-    pub fn shell_kind(&self) -> ShellKind {
+    pub fn shell_kind(&self, is_windows: bool) -> ShellKind {
        match self {
-            Shell::Program(program) => ShellKind::new(program),
-            Shell::WithArguments { program, .. } => ShellKind::new(program),
+            Shell::Program(program) => ShellKind::new(program, is_windows),
+            Shell::WithArguments { program, .. } => ShellKind::new(program, is_windows),
            Shell::System => ShellKind::system(),
        }
    }