diff options
| -rw-r--r-- | makima/src/daemon/worktree/manager.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/makima/src/daemon/worktree/manager.rs b/makima/src/daemon/worktree/manager.rs index 2e2b58e..2caa86a 100644 --- a/makima/src/daemon/worktree/manager.rs +++ b/makima/src/daemon/worktree/manager.rs @@ -491,8 +491,11 @@ impl WorktreeManager { .output() .await; - // Create the worktree with a new branch based on the local base_branch - let output = Command::new("git") + // 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") .args([ "rev-parse", "--verify", |