From 1aac7ac9d0684104badb15c730af05456c50e378 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Tue, 18 Jun 2019 07:54:32 -0700
Subject: [PATCH] chore: fix current branch fetch on master (#18844)

---
 script/lib/utils.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/script/lib/utils.js b/script/lib/utils.js
index bb098351ece9..d016845d490e 100644
--- a/script/lib/utils.js
+++ b/script/lib/utils.js
@@ -28,7 +28,8 @@ function getAbsoluteElectronExec () {
 async function handleGitCall (args, gitDir) {
   const details = await GitProcess.exec(args, gitDir)
   if (details.exitCode === 0) {
-    return details.stdout.trim()
+    const output = details.stdout.replace(/^\*|\s+|\s+$/, '')
+    return output.trim()
   } else {
     const error = GitProcess.parseError(details.stderr)
     console.log(`${fail} couldn't parse git process call: `, error)
@@ -38,10 +39,14 @@ async function handleGitCall (args, gitDir) {
 
 async function getCurrentBranch (gitDir) {
   let branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir)
-  if (!branch.match(/[0-9]+-[0-9]+-x/)) {
+  if (branch !== 'master' && !branch.match(/[0-9]+-[0-9]+-x/)) {
     const lastCommit = await handleGitCall(['rev-parse', 'HEAD'], gitDir)
     const branches = (await handleGitCall(['branch', '--contains', lastCommit], gitDir)).split('\n')
-    branch = branches.filter(b => b.match(/[0-9]+-[0-9]+-x/))[0].trim()
+    branch = branches.filter(b => b === 'master' || b.match(/[0-9]+-[0-9]+-x/))[0]
+    if (!branch) {
+      console.log(`${fail} no release branch exists for this ref`)
+      process.exit(1)
+    }
   }
   return branch
 }