mirror of
https://forgejo.stefka.eu/jiriks74/create-pull-request.git
synced 2025-01-18 16:01:06 +01:00
Values seem to be changing
cache values locally so they can't change later
This commit is contained in:
parent
660cc9b49b
commit
89fb1fe67a
1 changed files with 2 additions and 1 deletions
|
@ -190,12 +190,13 @@ export async function createOrUpdateBranch(
|
|||
core.info(
|
||||
`Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'`
|
||||
)
|
||||
const compareBranches = `${base}..${tempBranch}`
|
||||
// Checkout the actual base
|
||||
await git.fetch([`${base}:${base}`], baseRemote, ['--force'])
|
||||
await git.checkout(base)
|
||||
// Cherrypick commits from the temporary branch starting from the working base
|
||||
const commits = await git.revList(
|
||||
[`${base}..${tempBranch}`, '.'],
|
||||
[compareBranches, '.'],
|
||||
['--reverse']
|
||||
)
|
||||
for (const commit of splitLines(commits)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue