From dc468d563f1cdf3dfbeeb97dc29543b3ae9442e2 Mon Sep 17 00:00:00 2001
From: Dylan <dylan.hurd@openai.com>
Date: Wed, 6 Aug 2025 08:05:17 -0700
Subject: [PATCH] [env] Remove git config for now (#1884)

## Summary
Forgot to remove this in #1869 last night! Too much of a performance hit
on the main thread. We can bring it back via an async thread on startup.
---
 codex-rs/core/src/client_common.rs        | 3 ---
 codex-rs/core/src/codex.rs                | 2 --
 codex-rs/mcp-server/tests/send_message.rs | 2 +-
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/codex-rs/core/src/client_common.rs b/codex-rs/core/src/client_common.rs
index 2ca060f4..b37b1e3f 100644
--- a/codex-rs/core/src/client_common.rs
+++ b/codex-rs/core/src/client_common.rs
@@ -1,7 +1,6 @@
 use crate::config_types::ReasoningEffort as ReasoningEffortConfig;
 use crate::config_types::ReasoningSummary as ReasoningSummaryConfig;
 use crate::error::Result;
-use crate::git_info::GitInfo;
 use crate::model_family::ModelFamily;
 use crate::models::ContentItem;
 use crate::models::ResponseItem;
@@ -35,7 +34,6 @@ const USER_INSTRUCTIONS_END: &str = "\n\n</user_instructions>";
 #[derive(Debug, Clone)]
 pub(crate) struct EnvironmentContext {
     pub cwd: PathBuf,
-    pub git_info: Option<GitInfo>,
     pub approval_policy: AskForApproval,
     pub sandbox_policy: SandboxPolicy,
 }
@@ -47,7 +45,6 @@ impl Display for EnvironmentContext {
             "Current working directory: {}",
             self.cwd.to_string_lossy()
         )?;
-        writeln!(f, "Is directory a git repo: {}", self.git_info.is_some())?;
         writeln!(f, "Approval policy: {}", self.approval_policy)?;
         writeln!(f, "Sandbox policy: {}", self.sandbox_policy)?;
 
diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index c85b1ce2..98d13b4c 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -52,7 +52,6 @@ use crate::exec::SandboxType;
 use crate::exec::StdoutStream;
 use crate::exec::process_exec_tool_call;
 use crate::exec_env::create_env;
-use crate::git_info::collect_git_info;
 use crate::mcp_connection_manager::McpConnectionManager;
 use crate::mcp_tool_call::handle_mcp_tool_call;
 use crate::models::ContentItem;
@@ -1228,7 +1227,6 @@ async fn run_turn(
         base_instructions_override: sess.base_instructions.clone(),
         environment_context: Some(EnvironmentContext {
             cwd: sess.cwd.clone(),
-            git_info: collect_git_info(&sess.cwd).await,
             approval_policy: sess.approval_policy,
             sandbox_policy: sess.sandbox_policy.clone(),
         }),
diff --git a/codex-rs/mcp-server/tests/send_message.rs b/codex-rs/mcp-server/tests/send_message.rs
index 6e138909..f06c1587 100644
--- a/codex-rs/mcp-server/tests/send_message.rs
+++ b/codex-rs/mcp-server/tests/send_message.rs
@@ -99,7 +99,7 @@ async fn test_send_message_success() {
         response
     );
     // wait for the server to hear the user message
-    sleep(Duration::from_secs(10));
+    sleep(Duration::from_secs(5));
 
     // Ensure the server and tempdir live until end of test
     drop(server);