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

only detect git encoding if files.autoGuessEncoding is enabled

Browse Source 
fixes #46826
This commit is contained in:
Joao Moreno
2018-03-28 12:51:24 +02:00
parent 8934ecc3f4
commit 42c882151f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -660,9 +660,13 @@ export class Repository {
return result.stdout;
}
async bufferString(object: string, encoding: string = 'utf8'): Promise<string> {
async bufferString(object: string, encoding: string = 'utf8', autoGuessEncoding = false): Promise<string> {
const stdout = await this.buffer(object);
encoding = detectEncoding(stdout) || encoding;
if (autoGuessEncoding) {
encoding = detectEncoding(stdout) || encoding;
}
encoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
return iconv.decode(stdout, encoding);