Merge pull request #23 from flupke/main

Add --no-ext-diff to git diff commands

Author: paleite

src/git.test.ts

@@ -56,7 +56,7 @@ describe("getDiffForFile", () => {
 
     const expectedCommand = "git";
     const expectedArgs =
-      'diff --diff-algorithm=histogram --diff-filter=ACM -M100% --relative --staged --unified=0 1234567';
+      'diff --no-ext-diff --diff-algorithm=histogram --diff-filter=ACM -M100% --relative --staged --unified=0 1234567';
 
     const lastCall = mockedChildProcess.execFileSync.mock.calls.at(-1);
     const [command, argsIncludingFile = []] = lastCall ?? [""];

src/git.ts

@@ -7,6 +7,7 @@ const COMMAND = "git";
 const getDiffForFile = (filePath: string, staged = false): string => {
   const args = [
     "diff",
+    "--no-ext-diff",
     "--diff-algorithm=histogram",
     "--diff-filter=ACM",
     "-M100%",
@@ -27,6 +28,7 @@ const getDiffForFile = (filePath: string, staged = false): string => {
 const getDiffFileList = (): string[] => {
   const args = [
     "diff",
+    "--no-ext-diff",
     "--diff-algorithm=histogram",
     "--diff-filter=ACM",
     "-M100%",
@@ -47,6 +49,7 @@ const getDiffFileList = (): string[] => {
 const hasCleanIndex = (filePath: string): boolean => {
   const args = [
     "diff",
+    "--no-ext-diff",
     "--quiet",
     "--relative",
     "--unified=0",