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

fix(pr): resolve unexpected behavior in create-pull-request #4197

Browse Source
This commit is contained in:
BLACKBOX Agent 2025-11-06 16:29:18 +00:00
parent 0edc001d28
commit 77b62e2232
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/index.js vendored
View File

@ -285,10 +285,12 @@ function createOrUpdateBranch(git, commitMessage, base, branch, branchRemoteName
// //
// For changes on base this reset is equivalent to a rebase of the pull request branch. // For changes on base this reset is equivalent to a rebase of the pull request branch.
const branchCommitsAhead = yield commitsAhead(git, base, branch); const branchCommitsAhead = yield commitsAhead(git, base, branch);
if ((yield git.hasDiff([`${branch}..${tempBranch}`])) || const shouldReset = (yield git.hasDiff([`${branch}..${tempBranch}`])) ||
branchCommitsAhead != tempBranchCommitsAhead || branchCommitsAhead != tempBranchCommitsAhead ||
!(tempBranchCommitsAhead > 0) || // !isAhead !(tempBranchCommitsAhead > 0) || // !isAhead
(yield commitsHaveDiff(git, branch, tempBranch, tempBranchCommitsAhead))) { (tempBranchCommitsAhead > 0 &&
(yield commitsHaveDiff(git, branch, tempBranch, tempBranchCommitsAhead)));
if (shouldReset) {
core.info(`Resetting '${branch}'`); core.info(`Resetting '${branch}'`);
// Alternatively, git switch -C branch tempBranch // Alternatively, git switch -C branch tempBranch
yield git.checkout(branch, tempBranch); yield git.checkout(branch, tempBranch);

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

@ -311,12 +311,19 @@ export async function createOrUpdateBranch(
// //
// For changes on base this reset is equivalent to a rebase of the pull request branch. // For changes on base this reset is equivalent to a rebase of the pull request branch.
const branchCommitsAhead = await commitsAhead(git, base, branch) const branchCommitsAhead = await commitsAhead(git, base, branch)
if ( const shouldReset =
(await git.hasDiff([`${branch}..${tempBranch}`])) || (await git.hasDiff([`${branch}..${tempBranch}`])) ||
branchCommitsAhead != tempBranchCommitsAhead || branchCommitsAhead != tempBranchCommitsAhead ||
!(tempBranchCommitsAhead > 0) || // !isAhead !(tempBranchCommitsAhead > 0) || // !isAhead
(await commitsHaveDiff(git, branch, tempBranch, tempBranchCommitsAhead)) (tempBranchCommitsAhead > 0 &&
) { (await commitsHaveDiff(
git,
branch,
tempBranch,
tempBranchCommitsAhead
)))
if (shouldReset) {
core.info(`Resetting '${branch}'`) core.info(`Resetting '${branch}'`)
// Alternatively, git switch -C branch tempBranch // Alternatively, git switch -C branch tempBranch
await git.checkout(branch, tempBranch) await git.checkout(branch, tempBranch)