scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Co-authored-by: Roo Code <roomote@roocode.com>
This commit is contained in:
roomote[bot] 2026-01-26 23:10:23 -05:00 • committed by GitHub
parent 2f92cb7a8d
commit 2391a0f065
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
webview-ui/src/components/worktrees/DeleteWorktreeModal.tsx
View file

@ -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(() => {
@ -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()}>
@ -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")}