mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: account for remotes in branch parsing (#18930)

Browse source
This commit is contained in:
Shelley Vohr 2019-06-21 13:59:00 -07:00 • committed by Samuel Attard
parent 81497c7f2e
commit bef9610f6a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
script/lib/utils.js
View file

@ -40,12 +40,19 @@ async function getCurrentBranch (gitDir) {
let branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir) let branch = await handleGitCall(['rev-parse', '--abbrev-ref', 'HEAD'], gitDir)
if (branch !== 'master' && !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 lastCommit = await handleGitCall(['rev-parse', 'HEAD'], gitDir)
const branches = (await handleGitCall(['branch', '--contains', lastCommit], gitDir)).split('\n') const branches = (await handleGitCall([
'branch',
'--contains',
lastCommit,
'--remote'
], gitDir)).split('\n')
branch = branches.filter(b => b === 'master' || b.match(/[0-9]+-[0-9]+-x/))[0] branch = branches.filter(b => b === 'master' || b.match(/[0-9]+-[0-9]+-x/))[0]
if (!branch) { if (!branch) {
console.log(`${fail} no release branch exists for this ref`) console.log(`${fail} no release branch exists for this ref`)
process.exit(1) process.exit(1)
} }
if (branch.startsWith('origin/')) branch = branch.substr('origin/'.length)
} }
return branch.trim() return branch.trim()
} }