Fixes #3378 worktree delete double confirm prompt

Author: eamodio

CHANGELOG.md

@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Fixes [#3344](https://github.com/gitkraken/vscode-gitlens/issues/3344) - Make changing the AI key easier
 - Fixes [#3377](https://github.com/gitkraken/vscode-gitlens/issues/3377) - Cannot read properties of undefined (reading 'start')
+- Fixes [#3377](https://github.com/gitkraken/vscode-gitlens/issues/3378) - Deleting a worktree (without force) with working changes causes double prompts
 - Fixes fixes issue with Jira integration not refreshing
 
 ## [15.1.0] - 2024-06-05

src/commands/git/worktree.ts

@@ -861,6 +861,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 
 			for (const uri of state.uris) {
 				let retry = false;
+				let skipHasChangesPrompt = false;
 				do {
 					retry = false;
 					const force = state.flags.includes('--force');
@@ -873,7 +874,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 								status = await worktree?.getStatus();
 							} catch {}
 
-							if (status?.hasChanges ?? false) {
+							if ((status?.hasChanges ?? false) && !skipHasChangesPrompt) {
 								const confirm: MessageItem = { title: 'Force Delete' };
 								const cancel: MessageItem = { title: 'Cancel', isCloseAffordance: true };
 								const result = await window.showWarningMessage(
@@ -889,6 +890,8 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 
 						await state.repo.deleteWorktree(uri, { force: force });
 					} catch (ex) {
+						skipHasChangesPrompt = false;
+
 						if (WorktreeDeleteError.is(ex)) {
 							if (ex.reason === WorktreeDeleteErrorReason.MainWorkingTree) {
 								void window.showErrorMessage('Unable to delete the main worktree');
@@ -907,6 +910,7 @@ export class WorktreeGitCommand extends QuickCommand<State> {
 								if (result === confirm) {
 									state.flags.push('--force');
 									retry = true;
+									skipHasChangesPrompt = ex.reason === WorktreeDeleteErrorReason.HasChanges;
 								}
 							}
 						} else {