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

don't decode stderr

Browse Source
This commit is contained in:
Joao Moreno
2017-04-24 10:37:15 +02:00
parent 7cf0ad0440
commit 3598679114
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -179,12 +179,12 @@ export async function exec(child: cp.ChildProcess, encoding: string = 'utf8'): P
new Promise<string>(c => {
const buffers: Buffer[] = [];
on(child.stdout, 'data', b => buffers.push(b));
once(child.stdout, 'close', () => c(decode(Buffer.concat(buffers), encoding)));
once(child.stdout, 'close', () => c(iconv.decode(Buffer.concat(buffers), encoding)));
}),
new Promise<string>(c => {
const buffers: Buffer[] = [];
on(child.stderr, 'data', b => buffers.push(b));
once(child.stderr, 'close', () => c(decode(Buffer.concat(buffers), encoding)));
once(child.stderr, 'close', () => c(Buffer.concat(buffers).toString('utf8')));
})
]);
@@ -193,10 +193,6 @@ export async function exec(child: cp.ChildProcess, encoding: string = 'utf8'): P
return { exitCode, stdout, stderr };
}
function decode(buffer: NodeBuffer, encoding: string): string {
return iconv.decode(buffer, encoding);
}
export interface IGitErrorData {
error?: Error;
message?: string;