Make doubly sure that we have a stream

puppup420247-org · Nov 8, 2019 · 8cc0010 · 8cc0010
1 parent 0cffa88
commit 8cc0010
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/app/src/lib/git/rebase.ts b/app/src/lib/git/rebase.ts
@@ -323,6 +323,11 @@ function configureOptionsForRebase(
 
   return merge(options, {
     processCallback: (process: ChildProcess) => {
+      // If Node.js encounters a synchronous runtime error while spawning
+      // `stdout` will be undefined and the error will be emitted asynchronously
+      if (!process.stdout) {
+        return
+      }
       const parser = new GitRebaseParser(rebasedCommitCount, totalCommitCount)
 
       // rebase emits progress messages on `stdout`, not `stderr`

diff --git a/app/src/lib/progress/from-process.ts b/app/src/lib/progress/from-process.ts
@@ -77,8 +77,12 @@ function createProgressProcessCallback(
       })
     }
 
-    byline(process.stderr).on('data', (line: string) => {
-      progressCallback(parser.parse(line))
-    })
+    // If Node.js encounters a synchronous runtime error while spawning
+    // `stderr` will be undefined and the error will be emitted asynchronously
+    if (process.stderr) {
+      byline(process.stderr).on('data', (line: string) => {
+        progressCallback(parser.parse(line))
+      })
+    }
   }
 }