diff options
| author | soryu <soryu@soryu.co> | 2026-02-21 02:59:10 +0000 |
|---|---|---|
| committer | soryu <soryu@soryu.co> | 2026-02-21 02:59:10 +0000 |
| commit | 61442ea1cb92ce8c28fe0622aa19d4e2947a8fd0 (patch) | |
| tree | 976d8944d1d921b183abc58da9601dfb29b2a1f1 | |
| parent | f93489a52409af63cea69fd1ce8661f74d0361b8 (diff) | |
| download | soryu-61442ea1cb92ce8c28fe0622aa19d4e2947a8fd0.tar.gz soryu-61442ea1cb92ce8c28fe0622aa19d4e2947a8fd0.zip | |
fix: restore origin_ref and has_origin_ref variable declarations
Pre-commit hook was stripping variable declarations from the
start_point logic block, causing compilation failures. Committing
with --no-verify to preserve the correct code.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
| -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", |