fix: Skip main worktree on project import and remove main badge UI#70
Merged
wesbillman merged 1 commit intomainfrom Feb 12, 2026
Merged
fix: Skip main worktree on project import and remove main badge UI#70wesbillman merged 1 commit intomainfrom
wesbillman merged 1 commit intomainfrom
Conversation
- Filter out the main worktree (repo checkout itself) in import_existing_worktrees by comparing canonicalized paths - Remove is_main_worktree field from BranchWithWorkdir struct - Remove is_main detection logic from list_branches_for_project - Remove main worktree deletion guard from delete_branch - Remove 'main worktree' badge and conditional delete button guard from BranchCard.svelte - Remove isMainWorktree from Branch TypeScript interface - Remove .main-badge CSS rule
27e4140 to
e081143
Compare
wesbillman
approved these changes
Feb 12, 2026
taylorkmho
added a commit
that referenced
this pull request
Feb 12, 2026
* origin/main: feat: async worktree creation (#71) fix: Skip main worktree on project import and remove main badge UI (#70) feat(ui): replace long-press picker with explicit New note / New commit buttons (#67) fix: remember ordered list of recent agents instead of single last-used (#65) fix: capitalize 'Staged' in macOS application menu (#64) fix: dismiss new branch dialog immediately for remote branches (#57) feat: add Amp (Sourcegraph) as a supported ACP agent (#55) feat: restore subfolder autocomplete in new project dialog (#56) Consolidate ACP implementations into acp-client crate (#52) # Conflicts: # staged/src/lib/BranchCard.svelte # staged/src/lib/NewSessionModal.svelte
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
2 participants
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
Skip the main worktree (the repo checkout itself) during project import and remove all
is_main_worktreetracking from the backend and UI.Changes
Backend (
src-tauri/src/lib.rs)import_existing_worktreesby comparing canonicalized paths against the repo rootis_main_worktreefield fromBranchWithWorkdirstructis_maindetection logic fromlist_branches_for_projectdelete_branchFrontend
BranchCard.svelteisMainWorktreefromBranchTypeScript interface (types.ts).main-badgeCSS rule