From ed84d7ec5ece272a2cb8dabd36cbd6074df0887e Mon Sep 17 00:00:00 2001 From: soryu Date: Thu, 19 Feb 2026 23:40:07 +0000 Subject: feat: add git/gh auth checks, git fetch on worktree, fix contracts overflow (#72) * feat: soryu-co/soryu - makima: Fix contracts page overflow - constrain layout to viewport height * feat: soryu-co/soryu - makima: Add git fetch to create_worktree and improve completion prompt merge conflict handling * WIP: heartbeat checkpoint --- makima/src/daemon/worktree/manager.rs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'makima/src/daemon/worktree') diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs index 30618ea..489c488 100644 --- a/makima/src/daemon/worktree/manager.rs +++ b/makima/src/daemon/worktree/manager.rs @@ -484,6 +484,13 @@ impl WorktreeManager { "Creating worktree with new branch" ); + // Fetch latest from remote to ensure origin refs are fresh + let _ = Command::new("git") + .args(["fetch", "origin", "--prune"]) + .current_dir(source_repo) + .output() + .await; + // Prefer origin/{base_branch} to get latest remote state. // If neither origin/{base_branch} nor {base_branch} exist (e.g. PR branch // was deleted after merge), fall back to the repo's default branch. -- cgit v1.2.3