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

[CI] test committed

Browse source
This commit is contained in:
peter-evans 2020-09-05 05:36:17 +00:00 • committed by GitHub
parent 5ea31358e9
commit 44a462d169
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
dist/index.js vendored
View file

@ -3080,9 +3080,15 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
core.info(`Pull request branch '${branch}' already exists as remote branch '${branchRemoteName}/${branch}'`);
// Checkout the pull request branch
yield git.checkout(branch);
if (yield hasDiff(git, branch, tempBranch)) {
// If the branch differs from the recreated temp version then the branch is reset
// For changes on base this action is similar to a rebase of the pull request branch
// Reset the branch if one of the following conditions is true.
// - If the branch differs from the recreated temp branch
// - If the branch is both ahead AND behind the base
// For changes on base this reset is equivalent to a rebase of the pull request branch.
// The second condition makes sure we catch a case where the branch was squash merged
// and we need to reset to make sure it doesn't appear to have a diff with the base.
if ((yield hasDiff(git, branch, tempBranch)) ||
((yield isAhead(git, base, branch)) &&
(yield isBehind(git, base, branch)))) {
core.info(`Resetting '${branch}'`);
// Alternatively, git switch -C branch tempBranch
yield git.checkout(branch, tempBranch);