From 71f9a23cd4742e5bff94da630ea9cc019a9caf87 Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Mon, 9 Sep 2019 22:45:13 -0400
Subject: [PATCH] Adds canConfirm flag for Git commands

---
 src/commands/git/stash.ts    | 6 +++++-
 src/commands/gitCommands.ts  | 3 +--
 src/commands/quickCommand.ts | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/commands/git/stash.ts b/src/commands/git/stash.ts
index d319773..64c33d1 100644
--- a/src/commands/git/stash.ts
+++ b/src/commands/git/stash.ts
@@ -108,12 +108,16 @@ export class StashGitCommand extends QuickCommandBase<State> {
 		};
 	}
 
+	get canConfirm(): boolean {
+		return this._subcommand !== undefined;
+	}
+
 	get canSkipConfirm(): boolean {
 		return this._subcommand === 'drop' ? false : super.canSkipConfirm;
 	}
 
 	get skipConfirmKey() {
-		return this._subcommand === undefined ? undefined : `${this.key}-${this._subcommand}:${this.pickedVia}`;
+		return `${this.key}${this._subcommand === undefined ? '' : `-${this._subcommand}`}:${this.pickedVia}`;
 	}
 
 	protected async *steps(): StepAsyncGenerator {
diff --git a/src/commands/gitCommands.ts b/src/commands/gitCommands.ts
index a78596e..58beee2 100644
--- a/src/commands/gitCommands.ts
+++ b/src/commands/gitCommands.ts
@@ -461,9 +461,8 @@ export class GitCommandsCommand extends Command {
 			}
 		}
 
+		if (!command.canConfirm) return buttons;
 		if (command.canSkipConfirm) {
-			if (command.skipConfirmKey === undefined) return buttons;
-
 			buttons.push(
 				command.confirm() ? this.GitQuickInputButtons.WillConfirm : this.GitQuickInputButtons.WillSkipConfirm
 			);
diff --git a/src/commands/quickCommand.ts b/src/commands/quickCommand.ts
index bc3e1b2..bde2a31 100644
--- a/src/commands/quickCommand.ts
+++ b/src/commands/quickCommand.ts
@@ -83,6 +83,10 @@ export abstract class QuickCommandBase<TState = any> implements QuickPickItem {
 		this.detail = options.detail;
 	}
 
+	get canConfirm(): boolean {
+		return true;
+	}
+
 	get canSkipConfirm(): boolean {
 		return true;
 	}
@@ -106,12 +110,12 @@ export abstract class QuickCommandBase<TState = any> implements QuickPickItem {
 		this._pickedVia = value;
 	}
 
-	get skipConfirmKey(): string | undefined {
+	get skipConfirmKey(): string {
 		return `${this.key}:${this.pickedVia}`;
 	}
 
 	confirm(override?: boolean) {
-		if (!this.canSkipConfirm || this.skipConfirmKey === undefined) return true;
+		if (!this.canConfirm || !this.canSkipConfirm) return true;
 
 		return override !== undefined
 			? override