Skip to content

fix: use --force by default when deleting worktrees #10986

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
mrubens merged 3 commits into from
Jan 27, 2026
Merged

fix: use --force by default when deleting worktrees #10986

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d36f4e
fix: use --force by default when deleting worktrees
roomote Jan 27, 2026
b64718d
refactor: remove redundant isLocked checkbox since force delete is al…
roomote Jan 27, 2026
91fcff1
refactor: always force delete unless worktree is locked
roomote Jan 27, 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
15 changes: 9 additions & 6 deletions webview-ui/src/components/worktrees/DeleteWorktreeModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const DeleteWorktreeModal = ({ open, onClose, worktree, onSuccess }: Dele
const { t } = useAppTranslation()

const [isDeleting, setIsDeleting] = useState(false)
const [forceDelete, setForceDelete] = useState(false)
const [forceDeleteLocked, setForceDeleteLocked] = useState(false)
const [error, setError] = useState<string | null>(null)

useEffect(() => {
Expand All @@ -44,12 +44,15 @@ export const DeleteWorktreeModal = ({ open, onClose, worktree, onSuccess }: Dele
setError(null)
setIsDeleting(true)

// Always force delete unless worktree is locked and user hasn't opted in
const shouldForce = worktree.isLocked ? forceDeleteLocked : true

vscode.postMessage({
type: "deleteWorktree",
worktreePath: worktree.path,
worktreeForce: forceDelete,
worktreeForce: shouldForce,
})
}, [worktree.path, forceDelete])
}, [worktree.path, worktree.isLocked, forceDeleteLocked])

return (
<Dialog open={open} onOpenChange={(isOpen: boolean) => !isOpen && onClose()}>
Expand Down Expand Up @@ -90,13 +93,13 @@ export const DeleteWorktreeModal = ({ open, onClose, worktree, onSuccess }: Dele
</div>
</div>

{/* Force delete option (if worktree is locked) */}
{/* Force delete option (only shown if worktree is locked) */}
{worktree.isLocked && (
<div className="flex items-center gap-2">
<Checkbox
id="force-delete"
checked={forceDelete}
onCheckedChange={(checked) => setForceDelete(checked === true)}
checked={forceDeleteLocked}
onCheckedChange={(checked) => setForceDeleteLocked(checked === true)}
/>
<label htmlFor="force-delete" className="text-sm text-vscode-foreground cursor-pointer">
{t("worktrees:forceDelete")}
Expand Down
Loading