Merge pull request #1058 from ahobson/fix-danger-local-main-branch-1057

Fix danger local with non master base branch
danger · Jul 24, 2020 · 7f6d2b3 · 7f6d2b3
2 parents 924a88f + 5ee6491
commit 7f6d2b3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/source/runner/dangerDSLJSON.ts b/source/runner/dangerDSLJSON.ts
@@ -37,7 +37,11 @@ export class DangerDSLJSON implements DangerDSLJSONType {
     const parsedString = JSON.parse(JSONString)
     Object.assign(this, parsedString.danger)
 
+    // Merge the command line settings with the settings from the
+    // original command invocation.  This is needed because some
+    // commands like danger-local have options that are unknown to
+    // danger-runner
     // @ts-ignore
-    this.settings.cliArgs = cliArgs
+    Object.assign(this.settings.cliArgs, cliArgs)
   }
 }