Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

acp_thread: Disable Git's configured pager in agent terminals (#61732)

Tim Vermeulen779c35d256a3
diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 38a9be32945..6091c475610 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -4404,8 +4404,9 @@ impl AcpThread {
};
let env = cx.spawn(async move |_, _| {
let mut env = env.await.unwrap_or_default();
- // Disables paging for `git` and hopefully other commands
- env.insert("PAGER".into(), "".into());
+
+ disable_pagers_through_env(&mut env);
+
for var in extra_env {
env.insert(var.name, var.value);
}
diff --git a/crates/acp_thread/src/terminal.rs b/crates/acp_thread/src/terminal.rs
index e52a3367a88..c3e8653fba5 100644
--- a/crates/acp_thread/src/terminal.rs
+++ b/crates/acp_thread/src/terminal.rs
@@ -630,10 +630,7 @@ pub async fn create_terminal_entity(
Default::default()
};
- // Disable pagers so agent/terminal commands don't hang behind interactive UIs
- env.insert("PAGER".into(), "".into());
- // Override user core.pager (e.g. delta) which Git prefers over PAGER
- env.insert("GIT_PAGER".into(), "cat".into());
+ disable_pagers_through_env(&mut env);
env.extend(env_vars);
// Use remote shell or default system shell, as appropriate
@@ -666,6 +663,13 @@ pub async fn create_terminal_entity(
.await
}
+// Disable pagers so agent/terminal commands don't hang behind interactive UIs
+pub(crate) fn disable_pagers_through_env(env: &mut collections::HashMap<String, String>) {
+ env.insert("PAGER".into(), "".into());
+ // Override user core.pager (e.g. delta) which Git prefers over PAGER
+ env.insert("GIT_PAGER".into(), "cat".into());
+}
+
#[cfg(all(test, target_os = "linux"))]
mod linux_tests {
use super::*;