Merge branch 'main' into patch-2

danger · Aug 22, 2022 · 180b18b · 180b18b
2 parents 36a7146 + 840ecd6
commit 180b18b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/platforms/git/localGetDiff.ts b/source/platforms/git/localGetDiff.ts
@@ -2,8 +2,9 @@ import { debug } from "../../debug"
 import { spawn } from "child_process"
 
 const d = debug("localGetDiff")
-const useCommittedDiffArgs = (base: string, head: string) => ["diff", `${base}...${head}`]
-const useStagingChanges = () => ["diff", "--staged"]
+const useCommittedDiffArgs = (base: string, head: string) => ["diff", "--src-prefix='a/' --dst-prefix='b/'", `${base}...${head}`]
+const useStagingChanges = (base: string) => ["diff", "--src-prefix='a/' --dst-prefix='b/'", "--staged"]
+
 export const localGetDiff = (base: string, head: string, staging: boolean = false) =>
   new Promise<string>((done) => {
     const args = staging ? useStagingChanges() : useCommittedDiffArgs(base, head)