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 branch 'master' of https://github.com/matthewshirley/vscode into matthewshirley-master

Browse Source
This commit is contained in:
Joao Moreno
2017-06-26 15:36:00 +02:00
parent 7b90f16e19 42ab4c41a4
commit 53ce1b0b46
5 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/git/src/git.ts
View File

@@ -290,6 +290,8 @@ function getGitErrorCode(stderr: string): string | undefined {
return GitErrorCodes.CantAccessRemote;
} else if (/branch '.+' is not fully merged/.test(stderr)) {
return GitErrorCodes.BranchNotFullyMerged;
} else if (/Couldn\'t find remote ref/.test(stderr)) {
return GitErrorCodes.CantAccessRemote;
}
return void 0;
@@ -748,13 +750,18 @@ export class Repository {
}
}
async pull(rebase?: boolean): Promise<void> {
async pull(rebase?: boolean, remote?: string, branch?: string): Promise<void> {
const args = ['pull'];
if (rebase) {
args.push('-r');
}
if (remote && branch) {
args.push(remote);
args.push(branch);
}
try {
await this.run(args);
} catch (err) {