fix: create worktree when using --from and auto-create on switch#2
Merged
rohoswagger merged 3 commits intorohoswagger:mainfrom Apr 16, 2026
Merged
Conversation
Two bugs prevented proper worktree management: 1. `ez create --from` never created a worktree because the condition `!no_worktree && from.is_none()` treated --from as implying no-worktree. The --from flag controls which branch is the parent, not whether a worktree is created. Now `ez create feat --from main` creates a worktree at .worktrees/feat as expected. 2. `ez switch` fell back to `git checkout` for branches without worktrees, hijacking the main worktree. Now it auto-creates a linked worktree for managed branches that don't have one, matching the worktree-first design.
…no-switch, duplicate branch, and switch_to edge cases
Owner
|
@dezren39 could you fix up CI for this and then i can go ahead and merge it in :) |
Apply rustfmt to checkout.rs and create.rs test code. Add .opencode/ and .worktrees/ to gitignore.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ez create --fromnow creates a worktree — Previously--fromalways skipped worktree creation due to!no_worktree && from.is_none(). The--fromflag controls which branch is the parent, not whether a worktree is created.ez switchauto-creates worktrees for managed branches — Previously fell back togit checkoutin the main worktree, hijacking it. Now creates a linked worktree for managed branches that don't have one.--no-worktreestill works as an explicit opt-out, with or without--from.Bug report
Root cause
create.rs:98:let use_worktree = !no_worktree && from.is_none()—from.is_none()wrongly disabled worktree creation whenever--fromwas used.checkout.rs:81-83: when a branch had no worktree,switch_to()did a rawgit checkoutinstead of creating a worktree.Changes
src/cmd/create.rs— Removedfrom.is_none()from worktree condition, consolidated 3 code paths into 2 (worktree vs--no-worktree)src/cmd/checkout.rs— Added auto-worktree creation for managed branches without one on switch; trunk still does plain checkout--no-worktreeopt-out