ckaczor/vscode-gitlens
1
0
Fork 0
mirror of https://github.com/ckaczor/vscode-gitlens.git synced 2026-02-13 11:38:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #96 - stops opening external diff if configured

Browse Source
This commit is contained in:
Eric Amodio
2017-06-15 23:44:41 -04:00
parent 45aa9b17ac
commit 6b4642d8c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/git/git.ts
View File

@@ -185,7 +185,7 @@ export class Git {
} }
static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string, encoding?: string) { static diff(repoPath: string, fileName: string, sha1?: string, sha2?: string, encoding?: string) {
const params = [`diff`, `--diff-filter=M`, `-M`]; const params = [`diff`, `--diff-filter=M`, `-M`, `--no-ext-diff`];
if (sha1) { if (sha1) {
params.push(sha1); params.push(sha1);
} }
@@ -197,7 +197,7 @@ export class Git {
} }
static diff_nameStatus(repoPath: string, sha1?: string, sha2?: string) { static diff_nameStatus(repoPath: string, sha1?: string, sha2?: string) {
const params = [`diff`, `--name-status`, `-M`]; const params = [`diff`, `--name-status`, `-M`, `--no-ext-diff`];
if (sha1) { if (sha1) {
params.push(sha1); params.push(sha1);
} }