actions/create-pull-request
1
0
Fork 0
mirror of https://forgejo.stefka.eu/jiriks74/create-pull-request.git synced 2025-01-18 16:01:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Values seem to be changing

Browse source 
cache values locally so they can't change later
This commit is contained in:
Taliesin Sisson 2023-04-04 20:43:42 +01:00 • committed by GitHub
parent 660cc9b49b
commit 89fb1fe67a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/create-or-update-branch.ts
View file

@ -190,12 +190,13 @@ export async function createOrUpdateBranch(
core.info( core.info(
`Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'` `Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'`
) )
const compareBranches = `${base}..${tempBranch}`
// Checkout the actual base // Checkout the actual base
await git.fetch([`${base}:${base}`], baseRemote, ['--force']) await git.fetch([`${base}:${base}`], baseRemote, ['--force'])
await git.checkout(base) await git.checkout(base)
// Cherrypick commits from the temporary branch starting from the working base // Cherrypick commits from the temporary branch starting from the working base
const commits = await git.revList( const commits = await git.revList(
[`${base}..${tempBranch}`, '.'], [compareBranches, '.'],
['--reverse'] ['--reverse']
) )
for (const commit of splitLines(commits)) { for (const commit of splitLines(commits)) {