From 4ee6091b3671300cab5a665a72eb19d6f695e906 Mon Sep 17 00:00:00 2001 From: Gary Miguel Date: Mon, 25 Mar 2024 10:08:15 -0700 Subject: [PATCH] Set --no-ext-diff when running git diff 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 --- src/commands/diffingCommands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/diffingCommands.ts b/src/commands/diffingCommands.ts index 8d1f953..ef718e7 100644 --- a/src/commands/diffingCommands.ts +++ b/src/commands/diffingCommands.ts @@ -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));