Merge pull request #293 from garymm/develop

Set --no-ext-diff when running git diff
kahole · Mar 25, 2024 · d02ed6f · d02ed6f
2 parents 5254658 + 4ee6091
commit d02ed6f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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));