Kill the askpass and credential helper processes separately

Author: smashwilson

bin/git-askpass-atom.js

@@ -43,7 +43,7 @@ function userHelper() {
 }
 
 function dialog() {
-  const payload = {prompt, includeUsername: false};
+  const payload = {prompt, includeUsername: false, pid: process.pid};
   log('requesting dialog through Atom socket');
   log(`prompt = "${prompt}"`);
 

bin/git-credential-atom.js

@@ -182,7 +182,7 @@ function dialog(query) {
   const prompt = 'Please enter your credentials for ' + url.format(query);
   const includeUsername = !query.username;
 
-  const payload = {prompt, includeUsername};
+  const payload = {prompt, includeUsername, pid: process.pid};
 
   return new Promise((resolve, reject) => {
     log('requesting dialog through Atom socket');

lib/git-prompt-server.js

@@ -1,5 +1,6 @@
 import net from 'net';
 import path from 'path';
+import treeKill from 'tree-kill';
 
 import {Emitter} from 'event-kit';
 
@@ -92,7 +93,12 @@ export default class GitPromptServer {
 
     Promise.resolve(this.promptForInput(query))
       .then(answer => connection.end(JSON.stringify(answer), 'utf-8'))
-      .catch(() => this.emitter.emit('did-cancel'));
+      .catch(() => {
+        this.emitter.emit('did-cancel');
+        if (query.pid) {
+          treeKill(query.pid);
+        }
+      });
   }
 
   onDidCancel(cb) {