jiriks74/create-pull-request
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

build file changes even when there is no diff

Browse source
This commit is contained in:
Peter Evans 2024-08-02 16:38:58 +00:00
parent 3a7a677a14
commit 018afb52b6
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
__test__/create-or-update-branch.int.test.ts
View file

@ -230,6 +230,13 @@ describe('create-or-update-branch tests', () => {
expect(workingBaseType).toEqual('commit')
})
it('tests buildBranchFileChanges with no diff', async () => {
await git.checkout(BRANCH, BASE)
const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH)
expect(branchFileChanges.additions.length).toEqual(0)
expect(branchFileChanges.deletions.length).toEqual(0)
})
it('tests buildBranchFileChanges with addition and modification', async () => {
await git.checkout(BRANCH, BASE)
const changes = await createChanges()

5
dist/index.js vendored
View file

@ -290,9 +290,8 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
// Check if the pull request branch is ahead of the base
result.hasDiffWithBase = yield isAhead(git, base, branch);
}
if (result.hasDiffWithBase) {
result.branchFileChanges = yield buildBranchFileChanges(git, base, branch);
}
// Build the branch file changes
result.branchFileChanges = yield buildBranchFileChanges(git, base, branch);
// Get the pull request branch SHA
result.headSha = yield git.revParse('HEAD');
// Delete the temporary branch

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

@ -333,9 +333,8 @@ export async function createOrUpdateBranch(
result.hasDiffWithBase = await isAhead(git, base, branch)
}
if (result.hasDiffWithBase) {
result.branchFileChanges = await buildBranchFileChanges(git, base, branch)
}
// Build the branch file changes
result.branchFileChanges = await buildBranchFileChanges(git, base, branch)
// Get the pull request branch SHA
result.headSha = await git.revParse('HEAD')