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

git: fix process env

Browse Source
This commit is contained in:
Joao Moreno
2017-01-10 17:07:44 +01:00
parent 786b01c3e9
commit 8805d211b7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,7 +253,6 @@ export interface IGitOptions {
gitPath: string;
version: string;
defaultEncoding?: string;
env?: any;
}
export const GitErrorCodes = {
@@ -280,7 +279,6 @@ export class Git {
private gitPath: string;
private version: string;
private env: any;
private defaultEncoding: string;
private _onOutput = new EventEmitter<string>();
@@ -290,7 +288,6 @@ export class Git {
this.gitPath = options.gitPath;
this.version = options.version;
this.defaultEncoding = options.defaultEncoding || 'utf8';
this.env = options.env || {};
}
open(repository: string, env: any = {}): Repository {
@@ -298,12 +295,12 @@ export class Git {
}
async exec(cwd: string, args: string[], options: any = {}): Promise<IExecutionResult> {
options = _.assign({ cwd: cwd }, options || {});
options = _.assign({ cwd }, options || {});
return await this._exec(args, options);
}
stream(cwd: string, args: string[], options: any = {}): cp.ChildProcess {
options = _.assign({ cwd: cwd }, options || {});
options = _.assign({ cwd }, options || {});
return this.spawn(args, options);
}
@@ -363,7 +360,7 @@ export class Git {
options.stdio = ['ignore', null, null]; // Unless provided, ignore stdin and leave default streams for stdout and stderr
}
options.env = _.assign({}, options.env || {}, this.env);
options.env = _.assign({}, process.env, options.env || {});
if (options.log !== false) {
this.log(`git ${args.join(' ')}\n`);