Looks like we get an exit code of 1 on Windows

smashwilson · smashwilson · commit 228a80f0b56f · 2017-05-04T13:18:13.000-04:00
diff --git a/lib/git-shell-out-strategy.js b/lib/git-shell-out-strategy.js
@@ -130,8 +130,12 @@ export default class GitShellOutStrategy {
       }
       return new Promise(async (resolve, reject) => {
         const {promise, cancel} = this.executeGitCommand(args, options, timingMarker);
+        let expectCancel = false;
         if (gitPromptServer) {
-          subscriptions.add(gitPromptServer.onDidCancel(cancel));
+          subscriptions.add(gitPromptServer.onDidCancel(() => {
+            expectCancel = true;
+            cancel();
+          }));
         }
 
         const {stdout, stderr, exitCode, timing} = await promise;
@@ -164,7 +168,7 @@ export default class GitShellOutStrategy {
           console.groupEnd();
         }
 
-        if (exitCode) {
+        if (exitCode !== 0 && !expectCancel) {
           const err = new GitError(
             `${formattedArgs} exited with code ${exitCode}\nstdout: ${stdout}\nstderr: ${stderr}`,
           );
