From 13c3ab4d5e95fd6e72935bd3f3a0f0629b0758e8 Mon Sep 17 00:00:00 2001
From: Peter Evans <18365890+peter-evans@users.noreply.github.com>
Date: Thu, 25 Jul 2024 14:47:48 +0000
Subject: [PATCH] shift setting the base to before the push

---
 dist/index.js              | 4 ++--
 src/create-pull-request.ts | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 96b2b90..7d06c5b 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -431,6 +431,8 @@ function createPullRequest(inputs) {
             // Create or update the pull request branch
             core.startGroup('Create or update the pull request branch');
             const result = yield (0, create_or_update_branch_1.createOrUpdateBranch)(git, inputs.commitMessage, inputs.base, inputs.branch, branchRemoteName, inputs.signoff, inputs.addPaths);
+            // Set the base. It would have been '' if not specified as an input
+            inputs.base = result.base;
             core.endGroup();
             if (['created', 'updated'].includes(result.action)) {
                 // The branch was created or updated
@@ -586,8 +588,6 @@ function createPullRequest(inputs) {
                 }
                 core.endGroup();
             }
-            // Set the base. It would have been '' if not specified as an input
-            inputs.base = result.base;
             if (result.hasDiffWithBase) {
                 // Create or update the pull request
                 core.startGroup('Create or update the pull request');
diff --git a/src/create-pull-request.ts b/src/create-pull-request.ts
index 7afc5a8..b476d75 100644
--- a/src/create-pull-request.ts
+++ b/src/create-pull-request.ts
@@ -194,6 +194,8 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       inputs.signoff,
       inputs.addPaths
     )
+    // Set the base. It would have been '' if not specified as an input
+    inputs.base = result.base
     core.endGroup()
 
     if (['created', 'updated'].includes(result.action)) {
@@ -400,9 +402,6 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       core.endGroup()
     }
 
-    // Set the base. It would have been '' if not specified as an input
-    inputs.base = result.base
-
     if (result.hasDiffWithBase) {
       // Create or update the pull request
       core.startGroup('Create or update the pull request')