From 2c843226d5ad3a6929428327583741e7d0b6c92c Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 4 Jan 2016 16:13:41 +0100 Subject: [PATCH] git lib: use iconv to decode buffers fixes #1539 --- src/vs/workbench/parts/git/node/git.lib.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/git/node/git.lib.ts b/src/vs/workbench/parts/git/node/git.lib.ts index af98a8625ab..a7a7e10b053 100644 --- a/src/vs/workbench/parts/git/node/git.lib.ts +++ b/src/vs/workbench/parts/git/node/git.lib.ts @@ -44,12 +44,12 @@ function exec(child: ChildProcess, encoding = 'utf8'): TPromise(c => { let buffers: Buffer[] = []; on(child.stdout, 'data', b => buffers.push(b)); - once(child.stdout, 'close', () => c(Buffer.concat(buffers).toString(encoding))); + once(child.stdout, 'close', () => c(iconv.decode(Buffer.concat(buffers), encoding))); }), new TPromise(c => { let buffers: Buffer[] = []; on(child.stderr, 'data', b => buffers.push(b)); - once(child.stderr, 'close', () => c(Buffer.concat(buffers).toString(encoding))); + once(child.stderr, 'close', () => c(iconv.decode(Buffer.concat(buffers), encoding))); }) ]).then(values => { disposeAll(disposables); -- GitLab