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

Add "pullFrom" git command

Browse Source 
Resolves Microsoft/vscode#26738
This commit is contained in:
Matt Shirley
2017-05-20 00:10:04 -07:00
parent 4ba9130583
commit 42ab4c41a4
5 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,6 +291,8 @@ function getGitErrorCode(stderr: string): string | undefined {
return GitErrorCodes.RepositoryNotFound;
} else if (/unable to access/.test(stderr)) {
return GitErrorCodes.CantAccessRemote;
} else if (/Couldn\'t find remote ref/.test(stderr)) {
return GitErrorCodes.CantAccessRemote;
}
return void 0;
@@ -730,13 +732,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) {