From b5bf3535ef2779e77c5066eaf2e586c7c65da1cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Cie=C5=9Blak?=
 <krzysztof_cieslak@windowslive.com>
Date: Tue, 20 Jun 2017 23:11:47 +0200
Subject: [PATCH] Fix stash pop

---
 extensions/git/src/commands.ts | 4 ++--
 extensions/git/src/git.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/git/src/commands.ts b/extensions/git/src/commands.ts
index 1b7be3597e0..762ea8e5384 100644
--- a/extensions/git/src/commands.ts
+++ b/extensions/git/src/commands.ts
@@ -1110,14 +1110,14 @@ export class CommandCenter {
 			return;
 		}
 
-		const picks = this.model.stashes.map(r => `#${r.id}:  ${r.description}`);
+		const picks = this.model.stashes.map(r => { return { label: `#${r.id}:  ${r.description}`, description: "", derails: "", id: r.id }; });
 		const placeHolder = localize('pick stash', "Pick a stash");
 		const choice = await window.showQuickPick(picks, { placeHolder });
 
 		if (!choice) {
 			return;
 		}
-		return await this.model.stash(true, choice);
+		return await this.model.stash(true, choice.id);
 	}
 
 	@command('git.stashPopLatest')
diff --git a/extensions/git/src/git.ts b/extensions/git/src/git.ts
index ec59d474d34..b38aa6c1204 100644
--- a/extensions/git/src/git.ts
+++ b/extensions/git/src/git.ts
@@ -849,7 +849,7 @@ export class Repository {
 			if (pop) {
 				args.push('pop');
 				if (index) {
-					args.push(`"stash{${index}}"`);
+					args.push(`stash@{${index}}`);
 				}
 			}
 
-- 
GitLab