kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-08-15 10:10:30 +03:00
Code Issues Projects Releases Wiki Activity

Set --no-ext-diff when running git diff

Browse Source 
If a user has the following set in their git config:

```properties
[diff]
  external = difft
```

edmagit will fail to parse the `git diff` output. This should fix that.

Fixes https://github.com/kahole/edamagit/issues/228
This commit is contained in:
Gary Miguel 2024-03-25 10:08:15 -07:00 committed by GitHub
parent 5254658934
commit 4ee6091b36
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands/diffingCommands.ts
View File

@ -82,7 +82,7 @@ async function diffWorktree({ repository }: MenuState) {
}
async function diff(repository: MagitRepository, id: string, args: string[] = []) {
const diffResult = await gitRun(repository.gitRepository, ['diff', ...args]);
const diffResult = await gitRun(repository.gitRepository, ['diff', '--no-ext-diff', ...args]);
const uri = DiffView.encodeLocation(repository, id);
return ViewUtils.showView(uri, new DiffView(uri, diffResult.stdout));