diff --git a/dist/index.js b/dist/index.js index 729ad11..f528857 100644 --- a/dist/index.js +++ b/dist/index.js @@ -7656,11 +7656,13 @@ function createPullRequest(inputs) { throw new Error('The checked out ref is not a valid base for a pull request. Unable to continue.'); } const workingBase = symbolicRefResult.stdout.trim(); - // Exit if the working base is a PR branch created by this action. - // This may occur when using a PAT instead of GITHUB_TOKEN because - // a PAT allows workflow actions to trigger further events. - if (workingBase.startsWith(inputs.branch)) { - throw new Error(`Working base branch '${workingBase}' was created by this action. Unable to continue.`); + // If the base is not specified it is assumed to be the working base. + const base = inputs.base ? inputs.base : workingBase; + // Throw an error if the base and branch are not different branches + // of the 'origin' remote. An identically named branch in the `fork` + // remote is perfectly fine. + if (branchRemoteName == 'origin' && base == inputs.branch) { + throw new Error(`The 'base' and 'branch' for a pull request must be different branches. Unable to continue.`); } core.endGroup(); // Apply the branch suffix if set diff --git a/report.txt b/report.txt new file mode 100644 index 0000000..04d664d --- /dev/null +++ b/report.txt @@ -0,0 +1 @@ +1597808065