diff options
| author | akbash <akbash@herdr.dev> | 2026-09-12 22:55:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-12 21:55:19 +0200 |
| commit | 96f232446743d603c0184f62ee8817ecfa27191b (patch) | |
| tree | c7e13054eb1ee0a3b090e9d645984398fb633c4a /src/client/shell/worktrees.rs | |
| parent | d184b41fa36923c132629af725ff98bb02aa1b61 (diff) | |
fix: allow retrying partial worktree removal (#3315)
refs #3314
Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com>
Diffstat (limited to 'src/client/shell/worktrees.rs')
| -rw-r--r-- | src/client/shell/worktrees.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/shell/worktrees.rs b/src/client/shell/worktrees.rs index bf923557..c50b86be 100644 --- a/src/client/shell/worktrees.rs +++ b/src/client/shell/worktrees.rs @@ -518,7 +518,9 @@ impl ClientShellState { true } (PendingEndpointKind::WorktreeRemove { forced: false }, Err(error)) - if error.code.as_deref() == Some("dirty_worktree_requires_force") => + if error.code.as_deref() == Some("dirty_worktree_requires_force") + || (error.code.as_deref() == Some("worktree_remove_failed") + && crate::worktree::is_not_working_tree_remove_error(&error.message)) => { if let Some(ClientShellOverlay::WorktreeRemove(remove)) = self.overlay.as_mut() { remove.removing = false; |