Pass exec options through gpgExec

smashwilson · smashwilson · commit 41ddbecbe7ed · 2017-03-30T12:56:47.000-04:00
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
@@ -207,12 +207,13 @@ export default class GitShellOutStrategy {
    * Execute a git command that may create a commit. If the command fails because the GPG binary was invoked and unable
    * to acquire a passphrase (because the pinentry program attempted to use a tty), retry with a `GitPromptServer`.
    */
-  gpgExec(args, {stdin} = {stdin: null}) {
+  gpgExec(args, options = {}) {
     const gpgArgs = ['-c', `gpg.program=${GPG_HELPER_PATH}`].concat(args);
-    return this.exec(gpgArgs, {stdin, writeOperation: true}).catch(err => {
-      if (err.code === 128 && /gpg failed/.test(err.stdErr)) {
+    return this.exec(gpgArgs, options).catch(err => {
+      if (err.code === 128 && /gpg failed/.test(err.stdErr) && !options.useGitPromptServer) {
         // Retry with a GitPromptServer
-        return this.exec(gpgArgs, {stdin, useGitPromptServer: true, writeOperation: true});
+        options.useGitPromptServer = true;
+        return this.exec(gpgArgs, options);
       } else {
         throw err;
       }
@@ -415,7 +416,7 @@ export default class GitShellOutStrategy {
    * Merge
    */
   merge(branchName) {
-    return this.gpgExec(['merge', branchName]);
+    return this.gpgExec(['merge', branchName], {writeOperation: true});
   }
 
   async isMerging() {
