diff options
| author | Ben Sima <ben@bensima.com> | 2025-12-18 16:21:39 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bensima.com> | 2025-12-18 16:21:39 -0500 |
| commit | 59f4af68ff678db2349d8a9f40fd24b943131439 (patch) | |
| tree | 5db77d9f950d9fd7d7d21ef154d75801b792689f /Omni | |
| parent | 828f459242380369f2975ab62e85e672df526e6b (diff) | |
Coder: git pull --ff-only in init phase
Diffstat (limited to 'Omni')
| -rw-r--r-- | Omni/Agent/Subagent/Coder.hs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Omni/Agent/Subagent/Coder.hs b/Omni/Agent/Subagent/Coder.hs index 0f5a274..523b035 100644 --- a/Omni/Agent/Subagent/Coder.hs +++ b/Omni/Agent/Subagent/Coder.hs @@ -144,6 +144,9 @@ runBashCapture cmd = do -- | Phase 1: Initialize - check environment, detect broken state runCoderInit :: CoderConfig -> IO InitResult runCoderInit cfg = do + -- Pull latest changes + _ <- runBashCapture "git pull --ff-only 2>&1 || true" + -- Check git status (_, branchOut, _) <- runBashCapture "git branch --show-current" let gitBranch = Text.strip branchOut |