Fixes #40 - encoding issues

eamodio · eamodio · commit 8a74950708f2 · 2017-05-24T12:52:47.000-04:00
This is only a partial fix, as vscode doesn't allow enough controls to fix everything
diff --git a/package.json b/package.json
@@ -902,22 +902,24 @@
     "dependencies": {
         "applicationinsights": "0.20.0",
         "copy-paste": "1.3.0",
+        "iconv-lite": "0.4.17",
         "ignore": "3.3.3",
         "lodash.debounce": "4.0.8",
         "lodash.escaperegexp": "4.1.2",
         "lodash.isequal": "4.5.0",
         "lodash.once": "4.1.1",
         "moment": "2.18.1",
-        "spawn-rx": "2.0.10",
+        "spawn-rx": "2.0.11",
         "tmp": "0.0.31"
     },
     "devDependencies": {
         "@types/applicationinsights": "0.15.33",
         "@types/copy-paste": "1.1.30",
+        "@types/iconv-lite": "0.0.1",
         "@types/mocha": "2.2.41",
         "@types/node": "7.0.22",
         "@types/tmp": "0.0.33",
-        "mocha": "3.4.1",
+        "mocha": "3.4.2",
         "tslint": "5.3.2",
         "typescript": "2.3.3",
         "vscode": "1.1.0"
diff --git a/src/git/git.ts b/src/git/git.ts
@@ -5,6 +5,7 @@ import { spawnPromise } from 'spawn-rx';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as tmp from 'tmp';
+import * as iconv from 'iconv-lite';
 
 export { IGit };
 export * from './models/models';
@@ -21,25 +22,43 @@ let git: IGit;
 const defaultLogParams = [`log`, `--name-status`, `--full-history`, `-M`, `--date=iso8601`, `--format=%H -%nauthor %an%nauthor-date %ai%nparents %P%nsummary %B%nfilename ?`];
 const defaultStashParams = [`stash`, `list`, `--name-status`, `--full-history`, `-M`, `--format=%H -%nauthor-date %ai%nreflog-selector %gd%nsummary %B%nfilename ?`];
 
-async function gitCommand(cwd: string, ...args: any[]) {
+let defaultEncoding = 'utf8';
+export function setDefaultEncoding(encoding: string) {
+    defaultEncoding = iconv.encodingExists(encoding) ? encoding : 'utf8';
+}
+
+const GitWarnings = [
+    /Not a git repository/,
+    /is outside repository/,
+    /no such path/,
+    /does not have any commits/
+];
+
+async function gitCommand(options: { cwd: string, encoding?: string }, ...args: any[]) {
     try {
         // Fixes https://github.com/eamodio/vscode-gitlens/issues/73
         // See https://stackoverflow.com/questions/4144417/how-to-handle-asian-characters-in-file-names-in-git-on-os-x
         args.splice(0, 0, '-c', 'core.quotepath=false');
 
-        const s = await spawnPromise(git.path, args, { cwd: cwd });
-        Logger.log('git', ...args, `  cwd='${cwd}'`);
-        return s;
+        const opts = { encoding: 'utf8', ...options };
+        const s = await spawnPromise(git.path, args, { cwd: options.cwd, encoding: (opts.encoding === 'utf8') ? 'utf8' : 'binary' });
+        Logger.log('git', ...args, `  cwd='${options.cwd}'`);
+        if (opts.encoding === 'utf8' || opts.encoding === 'binary') return s;
+
+        return iconv.decode(Buffer.from(s, 'binary'), opts.encoding);
     }
     catch (ex) {
         const msg = ex && ex.toString();
-        if (msg && (msg.includes('Not a git repository') || msg.includes('is outside repository') || msg.includes('no such path') || msg.includes('does not have any commits'))) {
-            Logger.warn('git', ...args, `  cwd='${cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
-            return '';
-        }
-        else {
-            Logger.error(ex, 'git', ...args, `  cwd='${cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
+        if (msg) {
+            for (const warning of GitWarnings) {
+                if (warning.test(msg)) {
+                    Logger.warn('git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
+                    return '';
+                }
+            }
         }
+
+        Logger.error(ex, 'git', ...args, `  cwd='${options.cwd}'`, msg && `\n  ${msg.replace(/\r?\n|\r/g, ' ')}`);
         throw ex;
     }
 }
@@ -62,14 +81,14 @@ export class Git {
     static async getRepoPath(cwd: string | undefined) {
         if (cwd === undefined) return '';
 
-        const data = await gitCommand(cwd, 'rev-parse', '--show-toplevel');
+        const data = await gitCommand({ cwd }, 'rev-parse', '--show-toplevel');
         if (!data) return '';
 
         return data.replace(/\r?\n|\r/g, '').replace(/\\/g, '/');
     }
 
     static async getVersionedFile(repoPath: string | undefined, fileName: string, branchOrSha: string) {
-        const data = await Git.show(repoPath, fileName, branchOrSha);
+        const data = await Git.show(repoPath, fileName, branchOrSha, 'binary');
 
         const suffix = Git.isSha(branchOrSha) ? branchOrSha.substring(0, 8) : branchOrSha;
         const ext = path.extname(fileName);
@@ -82,7 +101,7 @@ export class Git {
                     }
 
                     Logger.log(`getVersionedFile('${repoPath}', '${fileName}', ${branchOrSha}); destination=${destination}`);
-                    fs.appendFile(destination, data, err => {
+                    fs.appendFile(destination, data, { encoding: 'binary' }, err => {
                         if (err) {
                             reject(err);
                             return;
@@ -144,7 +163,7 @@ export class Git {
             params.push(sha);
         }
 
-        return gitCommand(root, ...params, `--`, file);
+        return gitCommand({ cwd: root }, ...params, `--`, file);
     }
 
     static branch(repoPath: string, all: boolean) {
@@ -153,19 +172,19 @@ export class Git {
             params.push(`-a`);
         }
 
-        return gitCommand(repoPath, ...params);
+        return gitCommand({ cwd: repoPath }, ...params);
     }
 
     static async config_get(key: string, repoPath?: string) {
         try {
-            return await gitCommand(repoPath || '', `config`, `--get`, key);
+            return await gitCommand({ cwd: repoPath || '' }, `config`, `--get`, key);
         }
         catch (ex) {
             return '';
         }
     }
 
-    static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string) {
+    static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string, encoding?: string) {
         const params = [`diff`, `--diff-filter=M`, `-M`];
         if (sha1) {
             params.push(sha1);
@@ -174,7 +193,7 @@ export class Git {
             params.push(sha2);
         }
 
-        return gitCommand(repoPath, ...params, '--', fileName);
+        return gitCommand({ cwd: repoPath, encoding: encoding || defaultEncoding }, ...params, '--', fileName);
     }
 
     static diff_nameStatus(repoPath: string, sha1?: string, sha2?: string) {
@@ -186,7 +205,7 @@ export class Git {
             params.push(sha2);
         }
 
-        return gitCommand(repoPath, ...params);
+        return gitCommand({ cwd: repoPath }, ...params);
     }
 
     static difftool_dirDiff(repoPath: string, sha1: string, sha2?: string) {
@@ -195,7 +214,7 @@ export class Git {
             params.push(sha2);
         }
 
-        return gitCommand(repoPath, ...params);
+        return gitCommand({ cwd: repoPath }, ...params);
     }
 
     static log(repoPath: string, sha?: string, maxCount?: number, reverse: boolean = false) {
@@ -213,7 +232,7 @@ export class Git {
                 params.push(sha);
             }
         }
-        return gitCommand(repoPath, ...params);
+        return gitCommand({ cwd: repoPath }, ...params);
     }
 
     static log_file(repoPath: string, fileName: string, sha?: string, maxCount?: number, reverse: boolean = false, startLine?: number, endLine?: number) {
@@ -250,7 +269,7 @@ export class Git {
         params.push(`--`);
         params.push(file);
 
-        return gitCommand(root, ...params);
+        return gitCommand({ cwd: root }, ...params);
     }
 
     static log_search(repoPath: string, search: string[] = [], maxCount?: number) {
@@ -259,46 +278,46 @@ export class Git {
             params.push(`-n${maxCount}`);
         }
 
-        return gitCommand(repoPath, ...params, ...search);
+        return gitCommand({ cwd: repoPath }, ...params, ...search);
     }
 
     static async ls_files(repoPath: string, fileName: string): Promise<string> {
         try {
-            return await gitCommand(repoPath, 'ls-files', fileName);
+            return await gitCommand({ cwd: repoPath }, 'ls-files', fileName);
         }
         catch (ex) {
             return '';
         }
     }
 
     static remote(repoPath: string): Promise<string> {
-        return gitCommand(repoPath, 'remote', '-v');
+        return gitCommand({ cwd: repoPath }, 'remote', '-v');
     }
 
     static remote_url(repoPath: string, remote: string): Promise<string> {
-        return gitCommand(repoPath, 'remote', 'get-url', remote);
+        return gitCommand({ cwd: repoPath }, 'remote', 'get-url', remote);
     }
 
-    static show(repoPath: string | undefined, fileName: string, branchOrSha: string) {
+    static show(repoPath: string | undefined, fileName: string, branchOrSha: string, encoding?: string) {
         const [file, root] = Git.splitPath(fileName, repoPath);
         branchOrSha = branchOrSha.replace('^', '');
 
         if (Git.isUncommitted(branchOrSha)) return Promise.reject(new Error(`sha=${branchOrSha} is uncommitted`));
-        return gitCommand(root, 'show', `${branchOrSha}:./${file}`);
+        return gitCommand({ cwd: root, encoding: encoding || defaultEncoding }, 'show', `${branchOrSha}:./${file}`);
     }
 
     static stash_apply(repoPath: string, stashName: string, deleteAfter: boolean) {
         if (!stashName) return undefined;
-        return gitCommand(repoPath, 'stash', deleteAfter ? 'pop' : 'apply', stashName);
+        return gitCommand({ cwd: repoPath }, 'stash', deleteAfter ? 'pop' : 'apply', stashName);
     }
 
     static stash_delete(repoPath: string, stashName: string) {
         if (!stashName) return undefined;
-        return gitCommand(repoPath, 'stash', 'drop', stashName);
+        return gitCommand({ cwd: repoPath }, 'stash', 'drop', stashName);
     }
 
     static stash_list(repoPath: string) {
-        return gitCommand(repoPath, ...defaultStashParams);
+        return gitCommand({ cwd: repoPath }, ...defaultStashParams);
     }
 
     static stash_save(repoPath: string, message?: string, unstagedOnly: boolean = false) {
@@ -309,18 +328,18 @@ export class Git {
         if (message) {
             params.push(message);
         }
-        return gitCommand(repoPath, ...params);
+        return gitCommand({ cwd: repoPath }, ...params);
     }
 
     static status(repoPath: string, porcelainVersion: number = 1): Promise<string> {
         const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
-        return gitCommand(repoPath, 'status', porcelain, '--branch');
+        return gitCommand({ cwd: repoPath }, 'status', porcelain, '--branch');
     }
 
     static status_file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {
         const [file, root] = Git.splitPath(fileName, repoPath);
 
         const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
-        return gitCommand(root, 'status', porcelain, file);
+        return gitCommand({ cwd: root }, 'status', porcelain, file);
     }
 }
diff --git a/src/gitService.ts b/src/gitService.ts
@@ -4,7 +4,7 @@ import { Disposable, Event, EventEmitter, ExtensionContext, FileSystemWatcher, l
 import { CommandContext, setCommandContext } from './commands';
 import { CodeLensVisibility, IConfig } from './configuration';
 import { DocumentSchemes, ExtensionKey } from './constants';
-import { Git, GitBlameParser, GitBranch, GitCommit, GitDiffParser, GitLogCommit, GitLogParser, GitRemote, GitStashParser, GitStatusFile, GitStatusParser, IGit, IGitAuthor, IGitBlame, IGitBlameLine, IGitBlameLines, IGitDiff, IGitLog, IGitStash, IGitStatus } from './git/git';
+import { Git, GitBlameParser, GitBranch, GitCommit, GitDiffParser, GitLogCommit, GitLogParser, GitRemote, GitStashParser, GitStatusFile, GitStatusParser, IGit, IGitAuthor, IGitBlame, IGitBlameLine, IGitBlameLines, IGitDiff, IGitLog, IGitStash, IGitStatus, setDefaultEncoding } from './git/git';
 import { GitUri, IGitCommitInfo, IGitUriData } from './git/gitUri';
 import { GitCodeLensProvider } from './gitCodeLensProvider';
 import { Logger } from './logger';
@@ -129,6 +129,9 @@ export class GitService extends Disposable {
     }
 
     private _onConfigurationChanged() {
+        const encoding = workspace.getConfiguration('files').get<string>('encoding', 'utf8');
+        setDefaultEncoding(encoding);
+
         const cfg = workspace.getConfiguration().get<IConfig>(ExtensionKey)!;
 
         const codeLensChanged = !Objects.areEquivalent(cfg.codeLens, this.config && this.config.codeLens);

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { spawnPromise } from 'spawn-rx';`
`5`	`5`	`import * as fs from 'fs';`
`6`	`6`	`import * as path from 'path';`
`7`	`7`	`import * as tmp from 'tmp';`
	`8`	`+import * as iconv from 'iconv-lite';`
`8`	`9`
`9`	`10`	`export { IGit };`
`10`	`11`	`export * from './models/models';`
`@@ -21,25 +22,43 @@ let git: IGit;`
`21`	`22`	const defaultLogParams = [`log`, `--name-status`, `--full-history`, `-M`, `--date=iso8601`, `--format=%H -%nauthor %an%nauthor-date %ai%nparents %P%nsummary %B%nfilename ?`];
`22`	`23`	const defaultStashParams = [`stash`, `list`, `--name-status`, `--full-history`, `-M`, `--format=%H -%nauthor-date %ai%nreflog-selector %gd%nsummary %B%nfilename ?`];
`23`	`24`
`24`		`-async function gitCommand(cwd: string, ...args: any[]) {`
	`25`	`+let defaultEncoding = 'utf8';`
	`26`	`+export function setDefaultEncoding(encoding: string) {`
	`27`	`+ defaultEncoding = iconv.encodingExists(encoding) ? encoding : 'utf8';`
	`28`	`+}`
	`29`	`+`
	`30`	`+const GitWarnings = [`
	`31`	`+ /Not a git repository/,`
	`32`	`+ /is outside repository/,`
	`33`	`+ /no such path/,`
	`34`	`+ /does not have any commits/`
	`35`	`+];`
	`36`	`+`
	`37`	`+async function gitCommand(options: { cwd: string, encoding?: string }, ...args: any[]) {`
`25`	`38`	`try {`
`26`	`39`	`// Fixes https://github.com/eamodio/vscode-gitlens/issues/73`
`27`	`40`	`// See https://stackoverflow.com/questions/4144417/how-to-handle-asian-characters-in-file-names-in-git-on-os-x`
`28`	`41`	`args.splice(0, 0, '-c', 'core.quotepath=false');`
`29`	`42`
`30`		`- const s = await spawnPromise(git.path, args, { cwd: cwd });`
`31`		- Logger.log('git', ...args, ` cwd='${cwd}'`);
`32`		`- return s;`
	`43`	`+ const opts = { encoding: 'utf8', ...options };`
	`44`	`+ const s = await spawnPromise(git.path, args, { cwd: options.cwd, encoding: (opts.encoding === 'utf8') ? 'utf8' : 'binary' });`
	`45`	+ Logger.log('git', ...args, ` cwd='${options.cwd}'`);
	`46`	`+ if (opts.encoding === 'utf8' \|\| opts.encoding === 'binary') return s;`
	`47`	`+`
	`48`	`+ return iconv.decode(Buffer.from(s, 'binary'), opts.encoding);`
`33`	`49`	`}`
`34`	`50`	`catch (ex) {`
`35`	`51`	`const msg = ex && ex.toString();`
`36`		`- if (msg && (msg.includes('Not a git repository') \|\| msg.includes('is outside repository') \|\| msg.includes('no such path') \|\| msg.includes('does not have any commits'))) {`
`37`		- Logger.warn('git', ...args, ` cwd='${cwd}'`, msg && `\n ${msg.replace(/\r?\n\|\r/g, ' ')}`);
`38`		`- return '';`
`39`		`- }`
`40`		`- else {`
`41`		- Logger.error(ex, 'git', ...args, ` cwd='${cwd}'`, msg && `\n ${msg.replace(/\r?\n\|\r/g, ' ')}`);
	`52`	`+ if (msg) {`
	`53`	`+ for (const warning of GitWarnings) {`
	`54`	`+ if (warning.test(msg)) {`
	`55`	+ Logger.warn('git', ...args, ` cwd='${options.cwd}'`, msg && `\n ${msg.replace(/\r?\n\|\r/g, ' ')}`);
	`56`	`+ return '';`
	`57`	`+ }`
	`58`	`+ }`
`42`	`59`	`}`
	`60`	`+`
	`61`	+ Logger.error(ex, 'git', ...args, ` cwd='${options.cwd}'`, msg && `\n ${msg.replace(/\r?\n\|\r/g, ' ')}`);
`43`	`62`	`throw ex;`
`44`	`63`	`}`
`45`	`64`	`}`
`@@ -62,14 +81,14 @@ export class Git {`
`62`	`81`	`static async getRepoPath(cwd: string \| undefined) {`
`63`	`82`	`if (cwd === undefined) return '';`
`64`	`83`
`65`		`- const data = await gitCommand(cwd, 'rev-parse', '--show-toplevel');`
	`84`	`+ const data = await gitCommand({ cwd }, 'rev-parse', '--show-toplevel');`
`66`	`85`	`if (!data) return '';`
`67`	`86`
`68`	`87`	`return data.replace(/\r?\n\|\r/g, '').replace(/\\/g, '/');`
`69`	`88`	`}`
`70`	`89`
`71`	`90`	`static async getVersionedFile(repoPath: string \| undefined, fileName: string, branchOrSha: string) {`
`72`		`- const data = await Git.show(repoPath, fileName, branchOrSha);`
	`91`	`+ const data = await Git.show(repoPath, fileName, branchOrSha, 'binary');`
`73`	`92`
`74`	`93`	`const suffix = Git.isSha(branchOrSha) ? branchOrSha.substring(0, 8) : branchOrSha;`
`75`	`94`	`const ext = path.extname(fileName);`
`@@ -82,7 +101,7 @@ export class Git {`
`82`	`101`	`}`
`83`	`102`
`84`	`103`	Logger.log(`getVersionedFile('${repoPath}', '${fileName}', ${branchOrSha}); destination=${destination}`);
`85`		`- fs.appendFile(destination, data, err => {`
	`104`	`+ fs.appendFile(destination, data, { encoding: 'binary' }, err => {`
`86`	`105`	`if (err) {`
`87`	`106`	`reject(err);`
`88`	`107`	`return;`
`@@ -144,7 +163,7 @@ export class Git {`
`144`	`163`	`params.push(sha);`
`145`	`164`	`}`
`146`	`165`
`147`		- return gitCommand(root, ...params, `--`, file);
	`166`	+ return gitCommand({ cwd: root }, ...params, `--`, file);
`148`	`167`	`}`
`149`	`168`
`150`	`169`	`static branch(repoPath: string, all: boolean) {`
`@@ -153,19 +172,19 @@ export class Git {`
`153`	`172`	params.push(`-a`);
`154`	`173`	`}`
`155`	`174`
`156`		`- return gitCommand(repoPath, ...params);`
	`175`	`+ return gitCommand({ cwd: repoPath }, ...params);`
`157`	`176`	`}`
`158`	`177`
`159`	`178`	`static async config_get(key: string, repoPath?: string) {`
`160`	`179`	`try {`
`161`		- return await gitCommand(repoPath \|\| '', `config`, `--get`, key);
	`180`	+ return await gitCommand({ cwd: repoPath \|\| '' }, `config`, `--get`, key);
`162`	`181`	`}`
`163`	`182`	`catch (ex) {`
`164`	`183`	`return '';`
`165`	`184`	`}`
`166`	`185`	`}`
`167`	`186`
`168`		`- static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string) {`
	`187`	`+ static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string, encoding?: string) {`
`169`	`188`	const params = [`diff`, `--diff-filter=M`, `-M`];
`170`	`189`	`if (sha1) {`
`171`	`190`	`params.push(sha1);`
`@@ -174,7 +193,7 @@ export class Git {`
`174`	`193`	`params.push(sha2);`
`175`	`194`	`}`
`176`	`195`
`177`		`- return gitCommand(repoPath, ...params, '--', fileName);`
	`196`	`+ return gitCommand({ cwd: repoPath, encoding: encoding \|\| defaultEncoding }, ...params, '--', fileName);`
`178`	`197`	`}`
`179`	`198`
`180`	`199`	`static diff_nameStatus(repoPath: string, sha1?: string, sha2?: string) {`
`@@ -186,7 +205,7 @@ export class Git {`
`186`	`205`	`params.push(sha2);`
`187`	`206`	`}`
`188`	`207`
`189`		`- return gitCommand(repoPath, ...params);`
	`208`	`+ return gitCommand({ cwd: repoPath }, ...params);`
`190`	`209`	`}`
`191`	`210`
`192`	`211`	`static difftool_dirDiff(repoPath: string, sha1: string, sha2?: string) {`
`@@ -195,7 +214,7 @@ export class Git {`
`195`	`214`	`params.push(sha2);`
`196`	`215`	`}`
`197`	`216`
`198`		`- return gitCommand(repoPath, ...params);`
	`217`	`+ return gitCommand({ cwd: repoPath }, ...params);`
`199`	`218`	`}`
`200`	`219`
`201`	`220`	`static log(repoPath: string, sha?: string, maxCount?: number, reverse: boolean = false) {`
`@@ -213,7 +232,7 @@ export class Git {`
`213`	`232`	`params.push(sha);`
`214`	`233`	`}`
`215`	`234`	`}`
`216`		`- return gitCommand(repoPath, ...params);`
	`235`	`+ return gitCommand({ cwd: repoPath }, ...params);`
`217`	`236`	`}`
`218`	`237`
`219`	`238`	`static log_file(repoPath: string, fileName: string, sha?: string, maxCount?: number, reverse: boolean = false, startLine?: number, endLine?: number) {`
`@@ -250,7 +269,7 @@ export class Git {`
`250`	`269`	params.push(`--`);
`251`	`270`	`params.push(file);`
`252`	`271`
`253`		`- return gitCommand(root, ...params);`
	`272`	`+ return gitCommand({ cwd: root }, ...params);`
`254`	`273`	`}`
`255`	`274`
`256`	`275`	`static log_search(repoPath: string, search: string[] = [], maxCount?: number) {`
`@@ -259,46 +278,46 @@ export class Git {`
`259`	`278`	params.push(`-n${maxCount}`);
`260`	`279`	`}`
`261`	`280`
`262`		`- return gitCommand(repoPath, ...params, ...search);`
	`281`	`+ return gitCommand({ cwd: repoPath }, ...params, ...search);`
`263`	`282`	`}`
`264`	`283`
`265`	`284`	`static async ls_files(repoPath: string, fileName: string): Promise<string> {`
`266`	`285`	`try {`
`267`		`- return await gitCommand(repoPath, 'ls-files', fileName);`
	`286`	`+ return await gitCommand({ cwd: repoPath }, 'ls-files', fileName);`
`268`	`287`	`}`
`269`	`288`	`catch (ex) {`
`270`	`289`	`return '';`
`271`	`290`	`}`
`272`	`291`	`}`
`273`	`292`
`274`	`293`	`static remote(repoPath: string): Promise<string> {`
`275`		`- return gitCommand(repoPath, 'remote', '-v');`
	`294`	`+ return gitCommand({ cwd: repoPath }, 'remote', '-v');`
`276`	`295`	`}`
`277`	`296`
`278`	`297`	`static remote_url(repoPath: string, remote: string): Promise<string> {`
`279`		`- return gitCommand(repoPath, 'remote', 'get-url', remote);`
	`298`	`+ return gitCommand({ cwd: repoPath }, 'remote', 'get-url', remote);`
`280`	`299`	`}`
`281`	`300`
`282`		`- static show(repoPath: string \| undefined, fileName: string, branchOrSha: string) {`
	`301`	`+ static show(repoPath: string \| undefined, fileName: string, branchOrSha: string, encoding?: string) {`
`283`	`302`	`const [file, root] = Git.splitPath(fileName, repoPath);`
`284`	`303`	`branchOrSha = branchOrSha.replace('^', '');`
`285`	`304`
`286`	`305`	if (Git.isUncommitted(branchOrSha)) return Promise.reject(new Error(`sha=${branchOrSha} is uncommitted`));
`287`		- return gitCommand(root, 'show', `${branchOrSha}:./${file}`);
	`306`	+ return gitCommand({ cwd: root, encoding: encoding \|\| defaultEncoding }, 'show', `${branchOrSha}:./${file}`);
`288`	`307`	`}`
`289`	`308`
`290`	`309`	`static stash_apply(repoPath: string, stashName: string, deleteAfter: boolean) {`
`291`	`310`	`if (!stashName) return undefined;`
`292`		`- return gitCommand(repoPath, 'stash', deleteAfter ? 'pop' : 'apply', stashName);`
	`311`	`+ return gitCommand({ cwd: repoPath }, 'stash', deleteAfter ? 'pop' : 'apply', stashName);`
`293`	`312`	`}`
`294`	`313`
`295`	`314`	`static stash_delete(repoPath: string, stashName: string) {`
`296`	`315`	`if (!stashName) return undefined;`
`297`		`- return gitCommand(repoPath, 'stash', 'drop', stashName);`
	`316`	`+ return gitCommand({ cwd: repoPath }, 'stash', 'drop', stashName);`
`298`	`317`	`}`
`299`	`318`
`300`	`319`	`static stash_list(repoPath: string) {`
`301`		`- return gitCommand(repoPath, ...defaultStashParams);`
	`320`	`+ return gitCommand({ cwd: repoPath }, ...defaultStashParams);`
`302`	`321`	`}`
`303`	`322`
`304`	`323`	`static stash_save(repoPath: string, message?: string, unstagedOnly: boolean = false) {`
`@@ -309,18 +328,18 @@ export class Git {`
`309`	`328`	`if (message) {`
`310`	`329`	`params.push(message);`
`311`	`330`	`}`
`312`		`- return gitCommand(repoPath, ...params);`
	`331`	`+ return gitCommand({ cwd: repoPath }, ...params);`
`313`	`332`	`}`
`314`	`333`
`315`	`334`	`static status(repoPath: string, porcelainVersion: number = 1): Promise<string> {`
`316`	`335`	const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
`317`		`- return gitCommand(repoPath, 'status', porcelain, '--branch');`
	`336`	`+ return gitCommand({ cwd: repoPath }, 'status', porcelain, '--branch');`
`318`	`337`	`}`
`319`	`338`
`320`	`339`	`static status_file(repoPath: string, fileName: string, porcelainVersion: number = 1): Promise<string> {`
`321`	`340`	`const [file, root] = Git.splitPath(fileName, repoPath);`
`322`	`341`
`323`	`342`	const porcelain = porcelainVersion >= 2 ? `--porcelain=v${porcelainVersion}` : '--porcelain';
`324`		`- return gitCommand(root, 'status', porcelain, file);`
	`343`	`+ return gitCommand({ cwd: root }, 'status', porcelain, file);`
`325`	`344`	`}`
`326`	`345`	`}`