fix release script hanging on applying new changes (#4908)

scripts/release/helpers/terminal.js

@@ -17,7 +17,7 @@ const RESET = '\x1b[0m'
 
 const print = (...msgs) => msgs.forEach(msg => process.stdout.write(msg))
 const log = (...msgs) => msgs.forEach(msg => print(`${msg}\n`))
-const fatal = (...msgs) => log(...msgs) || process.exit(1)
+const fatal = (...msgs) => fail() || log(...msgs) || process.exit(1)
 
 let timer
 let current
@@ -115,7 +115,9 @@ function fail (err) {
 
   current = undefined
 
-  throw err
+  if (err) {
+    throw err
+  }
 }
 
 // Parse CLI arguments into parameters and flags.

scripts/release/proposal.js

@@ -100,7 +100,10 @@ try {
     .replace(/\n/g, ' ').trim()
 
   if (proposalDiff) {
-    pass(`${proposalDiff.split(' ').length} new`)
+    // Get new changes since last commit of the proposal branch.
+    const newChanges = capture(`${diffCmd} v${newVersion}-proposal master`)
+
+    pass(`\n${newChanges}`)
 
     start('Apply changes from the main branch')
 
@@ -109,14 +112,11 @@ try {
       run('git reset --hard HEAD~1')
     }
 
-    // Output new changes since last commit of the proposal branch.
-    const newChanges = capture(`${diffCmd} v${newVersion}-proposal master`)
-
-    log(`\n${newChanges}\n`)
-
     // Cherry pick all new commits to the proposal branch.
     try {
       run(`echo "${proposalDiff}" | xargs git cherry-pick`)
+
+      pass()
     } catch (err) {
       fatal(
         'Cherry-pick failed. Resolve the conflicts and run `git cherry-pick --continue` to continue.',