Feat/worktree support #120
Merged
Conversation
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
- Add worktrees configuration nested under projects in mani.yaml - Auto-detect existing worktrees during `mani init` - Create worktrees during `mani sync` (creates branch if it doesn't exist) - Display worktrees in `mani list projects` and `mani describe projects` - Support default path (<project>/<branch>) and custom relative paths 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Always display Tags and Paths panes in ContextView regardless of item count - Always include Tags and Paths panes in focusable list - Add fallback in FocusNext/FocusPrevious to prevent panic when current focus is not in focusable list (e.g., clicking on empty pane then Tab) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Fix MergeThemeOptions to convert default values (empty bg to "-", "bold" to "b") so color tags parse correctly in InputField - Add worktree path validation (path is required) - Add worktrees to .gitignore - Add --remove-orphaned-worktrees flag to mani sync - Improve mani init to discover worktrees using git worktree list - Update documentation Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Use Go 1.22+ range over int syntax for cleaner loops. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Remove verbose feature list from CLI help - Add documentation and issue tracker links to help output - Simplify README description Addresses #118 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
When running `mani init`, only add the current directory as a project with `path: .` if it IS a git repository. If not inside a git repo, there's no point adding it as a project - only discovered subdirectory repos will be included. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
When mani init doesn't add any projects (e.g., outside a git repo), avoid printing an empty table by returning early from PrintProjectInit. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
benchstat requires multiple samples to calculate confidence intervals and detect meaningful differences between benchmark runs. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
alajmo
force-pushed
the
feat/worktree-support
branch
from
a2da149 to
d9f4228
Compare
- Simplify GetValue switch statements in project, tag, and task to use strings.ToLower() for case-insensitive matching with explicit default - Replace verbose pointer initialization with core.Ptr() helper in config - Rename "worktrees" header to "worktree" for consistency - Handle empty worktree list in project GetValue Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Remove duplicated comment in IsGitWorktree - Deduplicate GetWorktrees to delegate to core.GetWorktreeList - Allow worktree sync for local projects without a URL - Skip uncloned projects gracefully instead of erroring during worktree sync - Check all remotes for branch existence instead of hardcoding "origin" - Surface YAML decode errors in ParseWorktrees instead of silently skipping - Fix GetWdRemoteURL to use its path parameter instead of os.Getwd() - Use structured error types for worktree operations
Fix printKeyValue dropping prefix in non-colorized output, fix root project gitignore skip using resolved absolute path instead of dead "." check, remove buggy CheckRemoteBranchExists (wrong git ls-remote args), simplify IsGitWorktree return signature, simplify SyncWorktrees branch creation with try-then-fallback, add worktree auto-discovery for root project in InitMani, clean worktree paths with filepath.Clean, handle detached HEAD worktrees in GetWorktreeList, show path:branch in worktree GetValue output, add Short description to root command, fix typos in sync examples.
When a worktree directory is manually deleted, git retains metadata in .git/worktrees/ causing subsequent `git worktree add` to fail. Run `git worktree prune` at the start of SyncWorktrees to clean up stale references before attempting to create worktrees.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Add Git worktree support to mani, allowing users to define, auto-discover, and sync worktrees alongside their project repositories.
Features
Fixes & Improvements
Other