Skip to content

fix: correct worktree handling bugs in clean_gone command #27605

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

Open
alexhraber wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

fix: correct worktree handling bugs in clean_gone command #27605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e84c9
fix: correct worktree handling bugs in clean_gone command
alexhraber Feb 22, 2026
2b3386f
Merge pull request #1 from alexhraber/fix/worktree-clean-gone-bugs
alexhraber Feb 22, 2026
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
10 changes: 5 additions & 5 deletions plugins/commit-commands/commands/clean_gone.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ You need to execute the following bash commands to clean up stale local branches
3. **Finally, remove worktrees and delete [gone] branches (handles both regular and worktree branches)**
Execute this command:
```bash
# Process all [gone] branches, removing '+' prefix if present
git branch -v | grep '\[gone\]' | sed 's/^[+* ]//' | awk '{print $1}' | while read branch; do
# Process all [gone] branches, removing the 2-character prefix (+/*/space + space)
git branch -v | grep '\[gone\]' | sed 's/^.\{2\}//' | awk '{print $1}' | while read branch; do
echo "Processing branch: $branch"
# Find and remove worktree if it exists
worktree=$(git worktree list | grep "\\[$branch\\]" | awk '{print $1}')
if [ ! -z "$worktree" ] && [ "$worktree" != "$(git rev-parse --show-toplevel)" ]; then
# Find and remove worktree if it exists (use -F for literal string matching)
worktree=$(git worktree list | grep -F "[$branch]" | awk '{print $1}')
if [ -n "$worktree" ] && [ "$worktree" != "$(git rev-parse --show-toplevel)" ]; then
echo " Removing worktree: $worktree"
git worktree remove --force "$worktree"
fi
Expand Down