philipp/create-pull-request
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

try fix base tree

Browse Source
This commit is contained in:
Peter Evans
2024-08-08 18:36:07 +00:00
parent 90b04fe25b
commit b0303827bb
4 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/create-or-update-branch.ts
View File

@ -142,6 +142,7 @@ interface CreateOrUpdateBranchResult {
action: string
base: string
hasDiffWithBase: boolean
baseSha: string
headSha: string
branchCommits: Commit[]
}
@ -173,6 +174,7 @@ export async function createOrUpdateBranch(
action: 'none',
base: base,
hasDiffWithBase: false,
baseSha: '',
headSha: '',
branchCommits: []
}
@ -322,8 +324,9 @@ export async function createOrUpdateBranch(
// Build the branch commits
result.branchCommits = await buildBranchCommits(git, base, branch)
// Get the pull request branch SHA
result.headSha = await git.revParse('HEAD')
// Get the base and head SHAs
result.baseSha = await git.revParse(base)
result.headSha = await git.revParse(branch)
// Delete the temporary branch
await git.exec(['branch', '--delete', '--force', tempBranch])