Add uncommited changeds to LocalGit

* details in #972
danger · Feb 17, 2020 · e86579c · e86579c
1 parent 7d76e4b
commit e86579c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/source/platforms/LocalGit.ts b/source/platforms/LocalGit.ts
@@ -45,8 +45,9 @@ export class LocalGit implements Platform {
     const base = this.options.base || "master"
     const head = "HEAD"
     const diff = await this.getGitDiff()
+    const unstagedDiff = await localGetDiff(base, head, false)
     const commits: GitCommit[] = await localGetCommits(base, head)
-    const gitJSON = diffToGitJSONDSL(diff, commits)
+    const gitJSON = diffToGitJSONDSL(diff.concat(unstagedDiff), commits)
 
     const config: GitJSONToGitDSLConfig = {
       repo: process.cwd(),

diff --git a/source/platforms/git/localGetDiff.ts b/source/platforms/git/localGetDiff.ts
@@ -2,10 +2,11 @@ import { debug } from "../../debug"
 import { spawn } from "child_process"
 
 const d = debug("localGetDiff")
-
-export const localGetDiff = (base: string, head: string) =>
+const stagedDiffArgs = (base: string, head: string) => ["diff", `${base}...${head}`]
+const unstagedDiffArgas = (base: string) => ["diff", base]
+export const localGetDiff = (base: string, head: string, onlyUsedStaged: boolean = true) =>
   new Promise<string>(done => {
-    const args = ["diff", `${base}...${head}`]
+    const args = onlyUsedStaged ? stagedDiffArgs(base, head) : unstagedDiffArgas(base)
     let stdout = ""
 
     const child = spawn("git", args, { env: process.env })