From 10948913cd50a6790da012da5d02993befe4dd97 Mon Sep 17 00:00:00 2001 From: Chris Bookholt Date: Thu, 2 Jul 2026 04:48:32 -0700 Subject: [PATCH] test(git-utils): gate Unix-only merge-base imports --- codex-rs/git-utils/src/branch.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codex-rs/git-utils/src/branch.rs b/codex-rs/git-utils/src/branch.rs index 13cad88f7b..8d5c8f1e03 100644 --- a/codex-rs/git-utils/src/branch.rs +++ b/codex-rs/git-utils/src/branch.rs @@ -132,12 +132,16 @@ fn resolve_upstream_if_remote_ahead( mod tests { use super::merge_base_with_head; use crate::GitToolingError; + #[cfg(unix)] use crate::git_command::GitRunner; use crate::git_command::git_runner_construction_count; use crate::git_command::reset_git_runner_construction_count; + #[cfg(unix)] use crate::operations::ensure_git_repository; + #[cfg(unix)] use crate::operations::resolve_repository_root; use pretty_assertions::assert_eq; + #[cfg(unix)] use std::io; use std::path::Path; use std::process::Command;