Merge pull request #653 from peter-evans/fix-error-handling

fix: change or->and to catch all errors

dist/index.js

@@ -315,6 +315,12 @@ function createPullRequest(inputs) {
             if (branchRemoteName == 'origin' && base == inputs.branch) {
                 throw new Error(`The 'base' and 'branch' for a pull request must be different branches. Unable to continue.`);
             }
+            // For self-hosted runners the repository state persists between runs.
+            // This command prunes the stale remote ref when the pull request branch was
+            // deleted after being merged or closed. Without this the push using
+            // '--force-with-lease' fails due to "stale info."
+            // https://github.com/peter-evans/create-pull-request/issues/633
+            yield git.exec(['remote', 'prune', branchRemoteName]);
             core.endGroup();
             // Apply the branch suffix if set
             if (inputs.branchSuffix) {
@@ -905,8 +911,11 @@ class GitHubHelper {
                 };
             }
             catch (e) {
-                if (!e.message ||
+                if (e.message &&
-                    !e.message.includes(`A pull request already exists for ${headBranch}`)) {
+                    e.message.includes(`A pull request already exists for ${headBranch}`)) {
+                    core.info(`A pull request already exists for ${headBranch}`);
+                }
+                else {
                     throw e;
                 }
             }

src/create-pull-request.ts

@@ -106,6 +106,12 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
         `The 'base' and 'branch' for a pull request must be different branches. Unable to continue.`
       )
     }
+    // For self-hosted runners the repository state persists between runs.
+    // This command prunes the stale remote ref when the pull request branch was
+    // deleted after being merged or closed. Without this the push using
+    // '--force-with-lease' fails due to "stale info."
+    // https://github.com/peter-evans/create-pull-request/issues/633
+    await git.exec(['remote', 'prune', branchRemoteName])
     core.endGroup()
 
     // Apply the branch suffix if set

src/github-helper.ts

@@ -58,9 +58,11 @@ export class GitHubHelper {
       }
     } catch (e) {
       if (
-        !e.message ||
+        e.message &&
-        !e.message.includes(`A pull request already exists for ${headBranch}`)
+        e.message.includes(`A pull request already exists for ${headBranch}`)
       ) {
+        core.info(`A pull request already exists for ${headBranch}`)
+      } else {
         throw e
       }
     }