Skip to content

feat(workspace): accept repo@branch handle in worktree remove #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chubes4 merged 1 commit into from
Jun 16, 2026
Merged

feat(workspace): accept repo@branch handle in worktree remove #746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions inc/Cli/Commands/WorkspaceCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3459,11 +3459,13 @@ private function renderGitOperationResult( string $operation, array $result, arr
* # Just dirty detection, skip size scan
* wp datamachine-code workspace worktree list --with-status
*
* # Remove a worktree
* # Remove a worktree (two-arg form, or a single <repo>@<branch-slug> handle)
* wp datamachine-code workspace worktree remove data-machine fix/foo
* wp datamachine-code workspace worktree remove data-machine@fix-foo
*
* # Force-remove a dirty worktree
* wp datamachine-code workspace worktree remove data-machine fix/foo --force
* wp datamachine-code workspace worktree remove data-machine@fix-foo --force
*
* # Prune stale worktree registry entries across all primaries
* wp datamachine-code workspace worktree prune
Expand Down Expand Up @@ -3746,12 +3748,22 @@ public function worktree( array $args, array $assoc_args ): void {
break;

case 'remove':
if ( empty($args[1]) || empty($args[2]) ) {
WP_CLI::error('Usage: worktree remove <repo> <branch> [--force]');
// Accept either the two-arg `<repo> <branch>` form or a single
// `<repo>@<branch-slug>` handle (as printed by `list`/`path`/cleanup
// output). When both positionals are present, the two-arg form wins and
// acts as the disambiguator; a lone first arg containing `@` is split on
// the FIRST `@` into repo + branch-slug.
$remove_repo = (string) ( $args[1] ?? '' );
$remove_branch = (string) ( $args[2] ?? '' );
if ( '' === $remove_branch && false !== strpos($remove_repo, '@') ) {
list( $remove_repo, $remove_branch ) = explode('@', $remove_repo, 2);
}
if ( '' === $remove_repo || '' === $remove_branch ) {
WP_CLI::error('Usage: worktree remove <repo> <branch> | <repo>@<branch-slug> [--force]');
return;
}
$input['repo'] = $args[1];
$input['branch'] = $args[2];
$input['repo'] = $remove_repo;
$input['branch'] = $remove_branch;
$input['force'] = ! empty($assoc_args['force']);
break;

Expand Down
Loading