diff options
| author | soryu <soryu@soryu.co> | 2026-02-20 19:07:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-20 19:07:23 +0000 |
| commit | f93489a52409af63cea69fd1ce8661f74d0361b8 (patch) | |
| tree | 95b26658186138e3ad547e92d91aa3ca32b18aab /makima/src/daemon/worktree | |
| parent | 5f8cb48d153f3ef1480c73a1ac3536219755f7e3 (diff) | |
| download | soryu-f93489a52409af63cea69fd1ce8661f74d0361b8.tar.gz soryu-f93489a52409af63cea69fd1ce8661f74d0361b8.zip | |
feat: auto-remove merged steps, fix UI overflow, and improve worktree handling (#74)
* 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
* feat: soryu-co/soryu - makima: Add pending question notification badge to directive sidebar and nav
* feat: soryu-co/soryu - makima: Fix reconcile:on blocking - make phaseguard poll indefinitely instead of returning immediately
* feat: soryu-co/soryu - makima: Auto-remove merged steps before planning runs
Diffstat (limited to 'makima/src/daemon/worktree')
| -rw-r--r-- | makima/src/daemon/worktree/manager.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs index 2caa86a..2e2b58e 100644 --- a/makima/src/daemon/worktree/manager.rs +++ b/makima/src/daemon/worktree/manager.rs @@ -491,11 +491,8 @@ impl WorktreeManager { .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. - let origin_ref = format!("origin/{}", base_branch); - let has_origin_ref = Command::new("git") + // Create the worktree with a new branch based on the local base_branch + let output = Command::new("git") .args([ "rev-parse", "--verify", |