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

fix: pull changes from working branch

Browse source 
The temporary branch is created from the working base branch. So the differences between the two branches will always be none. What we want is all the differences from temporary branch to the base branch.
This commit is contained in:
Taliesin Sisson 2023-04-04 20:00:00 +01:00 • committed by GitHub
parent 1847e5d1d6
commit 660cc9b49b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,7 +195,7 @@ export async function createOrUpdateBranch(
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(
[`${workingBase}..${tempBranch}`, '.'], [`${base}..${tempBranch}`, '.'],
['--reverse'] ['--reverse']
) )
for (const commit of splitLines(commits)) { for (const commit of splitLines(commits)) {