Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/45341/head' of github.com:Microsoft/vscode into pr/45341

Browse Source
This commit is contained in:
Joao Moreno
2018-06-04 16:33:06 +02:00
parent 3de695109d 8a7d86836e
commit fb29dd0706
3 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/git/src/commands.ts
View File

@@ -1331,7 +1331,7 @@ export class CommandCenter {
return;
}
const remotePicks = remotes.map(r => ({ label: r.name, description: r.url }));
const remotePicks = remotes.filter(r => r.fetchUrl !== undefined).map(r => ({ label: r.name, description: r.fetchUrl! }));
const placeHolder = localize('pick remote pull repo', "Pick a remote to pull the branch from");
const remotePick = await window.showQuickPick(remotePicks, { placeHolder });
@@ -1438,7 +1438,7 @@ export class CommandCenter {
}
const branchName = repository.HEAD.name;
const picks = remotes.map(r => ({ label: r.name, description: r.url }));
const picks = remotes.filter(r => r.pushUrl !== undefined).map(r => ({ label: r.name, description: r.pushUrl! }));
const placeHolder = localize('pick remote', "Pick a remote to publish the branch '{0}' to:", branchName);
const pick = await window.showQuickPick(picks, { placeHolder });