chore: fix branch trimming for blast-off releases (electron#18909)

trop[bot] · codebytere · commit bd48dfe3cc82 · 2019-06-21T01:02:54.000-07:00
diff --git a/script/lib/utils.js b/script/lib/utils.js
@@ -27,8 +27,7 @@ function getAbsoluteElectronExec () {
 async function handleGitCall (args, gitDir) {
   const details = await GitProcess.exec(args, gitDir)
   if (details.exitCode === 0) {
-    const output = details.stdout.replace(/^\*|\s+|\s+$/, '')
-    return output.trim()
+    return details.stdout.replace(/^\*|\s+|\s+$/, '')
   } else {
     const error = GitProcess.parseError(details.stderr)
     console.log(`${fail} couldn't parse git process call: `, error)
@@ -47,7 +46,7 @@ async function getCurrentBranch (gitDir) {
       process.exit(1)
     }
   }
-  return branch
+  return branch.trim()
 }
 
 module.exports = {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ function getAbsoluteElectronExec () {`
`27`	`27`	`async function handleGitCall (args, gitDir) {`
`28`	`28`	`const details = await GitProcess.exec(args, gitDir)`
`29`	`29`	`if (details.exitCode === 0) {`
`30`		`- const output = details.stdout.replace(/^\*\|\s+\|\s+$/, '')`
`31`		`- return output.trim()`
	`30`	`+ return details.stdout.replace(/^\*\|\s+\|\s+$/, '')`
`32`	`31`	`} else {`
`33`	`32`	`const error = GitProcess.parseError(details.stderr)`
`34`	`33`	console.log(`${fail} couldn't parse git process call: `, error)
`@@ -47,7 +46,7 @@ async function getCurrentBranch (gitDir) {`
`47`	`46`	`process.exit(1)`
`48`	`47`	`}`
`49`	`48`	`}`
`50`		`- return branch`
	`49`	`+ return branch.trim()`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`module.exports = {`