From 27bf6d5c29ad370d28a874092c67e8df15795dc6 Mon Sep 17 00:00:00 2001 From: Chris Bookholt Date: Mon, 6 Jul 2026 20:23:47 -0700 Subject: [PATCH] codex: fix CI failure on PR #30854 --- codex-rs/git-utils/src/merge_driver_tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/codex-rs/git-utils/src/merge_driver_tests.rs b/codex-rs/git-utils/src/merge_driver_tests.rs index 32b84cd69b..8ceee59389 100644 --- a/codex-rs/git-utils/src/merge_driver_tests.rs +++ b/codex-rs/git-utils/src/merge_driver_tests.rs @@ -2303,5 +2303,6 @@ fn init_repo() -> tempfile::TempDir { let _ = run(root, &["git", "init"]); let _ = run(root, &["git", "config", "user.email", "codex@example.com"]); let _ = run(root, &["git", "config", "user.name", "Codex"]); + let _ = run(root, &["git", "config", "core.autocrlf", "false"]); repo }