From 97f398e677bd96e1c32a42c4a856125bbcc9909b Mon Sep 17 00:00:00 2001 From: Cole Miller Date: Mon, 13 Oct 2025 19:41:22 -0400 Subject: [PATCH] windows: Prefer Git Bash for external agent terminals (#40150) This applies the same change as #39466 to the terminal codepath for external agents. Release Notes: - N/A Co-authored-by: Max Brunsfeld --- crates/agent_servers/src/acp.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs index a1e40145d19fdf31e22f1d1adb57976a6fc9bc6f..6874b5deb669e604bc02ef65b163457eab75ddbf 100644 --- a/crates/agent_servers/src/acp.rs +++ b/crates/agent_servers/src/acp.rs @@ -10,7 +10,7 @@ use project::Project; use project::agent_server_store::AgentServerCommand; use serde::Deserialize; use task::Shell; -use util::ResultExt as _; +use util::{ResultExt as _, get_default_system_shell_preferring_bash}; use std::path::PathBuf; use std::{any::Any, cell::RefCell}; @@ -834,7 +834,7 @@ impl acp::Client for ClientDelegate { .and_then(|r| r.read(cx).default_system_shell()) .map(Shell::Program) })? - .unwrap_or(task::Shell::System); + .unwrap_or_else(|| Shell::Program(get_default_system_shell_preferring_bash())); let is_windows = project .read_with(&self.cx, |project, cx| project.path_style(cx).is_windows()) .unwrap_or(cfg!(windows));