Fix stash pop

microsoft · Aug 14, 2017 · b5bf353 · b5bf353
1 parent 13484ae
commit b5bf353
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -849,7 +849,7 @@ export class Repository {
 			if (pop) {
 				args.push('pop');
 				if (index) {
-					args.push(`"stash{${index}}"`);
+					args.push(`stash@{${index}}`);
 				}
 			}