fix: list pulls using the correct head format (#2792)

.github/workflows/ci.yml

@@ -19,23 +19,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 16.x
           cache: npm
-      - name: Install Docker
-        run: apt update && apt install docker.io -y
       - run: npm ci
       - run: npm run build
       - run: npm run format-check
       - run: npm run lint
       - run: npm run test
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: dist
           path: dist
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: action.yml
           path: action.yml
@@ -48,16 +46,16 @@ jobs:
       matrix:
         target: [built, committed]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: main
       - if: matrix.target == 'built' || github.event_name == 'pull_request'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
       - if: matrix.target == 'built' || github.event_name == 'pull_request'
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: action.yml
           path: .
@@ -70,8 +68,8 @@ jobs:
         uses: ./
         with:
           commit-message: '[CI] test ${{ matrix.target }}'
-          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           title: '[CI] test ${{ matrix.target }}'
           body: |
             - CI test case for target '${{ matrix.target }}'
@@ -94,7 +92,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Find Comment
-        uses: peter-evans/find-comment@v3
+        uses: peter-evans/find-comment@v2
         id: fc
         with:
           issue-number: ${{ github.event.number }}
@@ -103,7 +101,7 @@ jobs:
 
       - if: steps.fc.outputs.comment-id == ''
         name: Create comment
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v3
         with:
           issue-number: ${{ github.event.number }}
           body: |
@@ -111,22 +109,19 @@ jobs:
             ```
             /test repository=${{ github.event.pull_request.head.repo.full_name }} ref=${{ github.event.pull_request.head.ref }} build=true
             ```
-            ```
-            /test repository=${{ github.event.pull_request.head.repo.full_name }} ref=${{ github.event.pull_request.head.ref }} build=true sign-commits=true
-            ```
 
   package:
     if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: [test]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v3
         with:
           name: dist
           path: dist
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.ACTIONS_BOT_TOKEN }}
           commit-message: 'build: update distribution'

.github/workflows/cpr-example-command.yml

@@ -6,7 +6,7 @@ jobs:
   createPullRequest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Make changes to pull request
         run: date +%s > report.txt
@@ -16,8 +16,8 @@ jobs:
         uses: ./
         with:
           commit-message: Update report
-          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: false
           title: '[Example] Update report'
           body: |
@@ -42,7 +42,7 @@ jobs:
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
 
       - name: Add reaction
-        uses: peter-evans/create-or-update-comment@v4
+        uses: peter-evans/create-or-update-comment@v3
         with:
           repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
           comment-id: ${{ github.event.client_payload.github.payload.comment.id }}

.github/workflows/slash-command-dispatch.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Slash Command Dispatch
-        uses: peter-evans/slash-command-dispatch@v4
+        uses: peter-evans/slash-command-dispatch@v3
         with:
           token: ${{ secrets.ACTIONS_BOT_TOKEN }}
           config: >
@@ -19,7 +19,7 @@ jobs:
                 "named_args": true
               },
               {
-                "command": "testv5",
+                "command": "testv4",
                 "permission": "admin",
                 "repository": "peter-evans/create-pull-request-tests",
                 "named_args": true

.github/workflows/update-major-version.yml

@@ -11,14 +11,14 @@ on:
         type: choice
         description: The major version tag to update
         options:
-          - v6
+          - v4
-          - v7
+          - v5
 
 jobs:
   tag:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
       with:
         token: ${{ secrets.ACTIONS_BOT_TOKEN }}
         fetch-depth: 0

README.md

@@ -15,27 +15,26 @@ Create Pull Request action will:
    - tracked (modified) files
    - commits made during the workflow that have not been pushed
 2. Commit all changes to a new branch, or update an existing pull request branch.
-3. Create or update a pull request to merge the branch into the base—the branch checked out in the workflow.
+3. Create a pull request to merge the new branch into the base—the branch checked out in the workflow.
 
 ## Documentation
 
 - [Concepts, guidelines and advanced usage](docs/concepts-guidelines.md)
 - [Examples](docs/examples.md)
-- [Updating to v7](docs/updating.md)
+- [Updating to v5](docs/updating.md)
-- [Common issues](docs/common-issues.md)
 
 ## Usage
 
 ```yml
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
 ```
 
-You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v7.x.x`
+You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v5.x.x`
 
 ### Workflow permissions
 
@@ -48,22 +47,22 @@ For repositories belonging to an organization, this setting can be managed by ad
 
 All inputs are **optional**. If not set, sensible defaults will be used.
 
+**Note**: If you want pull requests created by this action to trigger an `on: push` or `on: pull_request` workflow then you cannot use the default `GITHUB_TOKEN`. See the [documentation here](docs/concepts-guidelines.md#triggering-further-workflow-runs) for workarounds.
+
 | Name | Description | Default |
 | --- | --- | --- |
-| `token` | The token that the action will use to create and update the pull request. See [token](#token). | `GITHUB_TOKEN` |
+| `token` | `GITHUB_TOKEN` (permissions `contents: write` and `pull-requests: write`) or a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token). | `GITHUB_TOKEN` |
-| `branch-token` | The token that the action will use to create and update the branch. See [branch-token](#branch-token). | Defaults to the value of `token` |
 | `path` | Relative path under `GITHUB_WORKSPACE` to the repository. | `GITHUB_WORKSPACE` |
 | `add-paths` | A comma or newline-separated list of file paths to commit. Paths should follow git's [pathspec](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec) syntax. If no paths are specified, all new and modified files are added. See [Add specific paths](#add-specific-paths). | |
-| `commit-message` | The message to use when committing changes. See [commit-message](#commit-message). | `[create-pull-request] automated change` |
+| `commit-message` | The message to use when committing changes. | `[create-pull-request] automated change` |
-| `committer` | The committer name and email address in the format `Display Name <email@address.com>`. Defaults to the GitHub Actions bot user on github.com. | `github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>` |
+| `committer` | The committer name and email address in the format `Display Name <email@address.com>`. Defaults to the GitHub Actions bot user. | `GitHub <noreply@github.com>` |
-| `author` | The author name and email address in the format `Display Name <email@address.com>`. Defaults to the user who triggered the workflow run. | `${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>` |
+| `author` | The author name and email address in the format `Display Name <email@address.com>`. Defaults to the user who triggered the workflow run. | `${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>` |
 | `signoff` | Add [`Signed-off-by`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) line by the committer at the end of the commit log message. | `false` |
 | `branch` | The pull request branch name. | `create-pull-request/patch` |
-| `delete-branch` | Delete the `branch` if it doesn't have an active pull request associated with it. See [delete-branch](#delete-branch). | `false` |
+| `delete-branch` | Delete the `branch` when closing pull requests, and when undeleted after merging. | `false` |
 | `branch-suffix` | The branch suffix type when using the alternative branching strategy. Valid values are `random`, `timestamp` and `short-commit-hash`. See [Alternative strategy](#alternative-strategy---always-create-a-new-pull-request-branch) for details. | |
 | `base` | Sets the pull request base branch. | Defaults to the branch checked out in the workflow. |
 | `push-to-fork` | A fork of the checked-out parent repository to which the pull request branch will be pushed. e.g. `owner/repo-fork`. The pull request will be created to merge the fork's branch into the parent's base. See [push pull request branches to a fork](docs/concepts-guidelines.md#push-pull-request-branches-to-a-fork) for details. | |
-| `sign-commits` | Sign commits as `github-actions[bot]` when using `GITHUB_TOKEN`, or your own bot when using [GitHub App tokens](docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens). See [commit signing](docs/concepts-guidelines.md#commit-signature-verification-for-bots) for details.  | `false` |
 | `title` | The title of the pull request. | `Changes by create-pull-request action` |
 | `body` | The body of the pull request. | `Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action` |
 | `body-path` | The path to a file containing the pull request body. Takes precedence over `body`. | |
@@ -72,66 +71,12 @@ All inputs are **optional**. If not set, sensible defaults will be used.
 | `reviewers` | A comma or newline-separated list of reviewers (GitHub usernames) to request a review from. | |
 | `team-reviewers` | A comma or newline-separated list of GitHub teams to request a review from. Note that a `repo` scoped [PAT](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token), or equivalent [GitHub App permissions](docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens), are required. | |
 | `milestone` | The number of the milestone to associate this pull request with. | |
-| `draft` | Create a [draft pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests). Valid values are `true` (only on create), `always-true` (on create and update), and `false`.  | `false` |
+| `draft` | Create a [draft pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests#draft-pull-requests). It is not possible to change draft status after creation except through the web interface. | `false` |
-| `maintainer-can-modify` | Indicates whether [maintainers can modify](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) the pull request. | `true` |
-
-#### token
-
-The token input defaults to the repository's `GITHUB_TOKEN`.
-
-> [!IMPORTANT]  
-> - If you want pull requests created by this action to trigger an `on: push` or `on: pull_request` workflow then you cannot use the default `GITHUB_TOKEN`. See the [documentation here](docs/concepts-guidelines.md#triggering-further-workflow-runs) for further details.
-> - If using the repository's `GITHUB_TOKEN` and your repository was created after 2nd February 2023, the [default permission is read-only](https://github.blog/changelog/2023-02-02-github-actions-updating-the-default-github_token-permissions-to-read-only/). Elevate the [permissions](https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/controlling-permissions-for-github_token#defining-access-for-the-github_token-permissions) in your workflow.
->   ```yml
->   permissions:
->     contents: write
->     pull-requests: write
->   ```
-
-Other token options:
-- Classic [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with `repo` scope.
-- Fine-grained [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with `contents: write` and `pull-requests: write` scopes.
-- [GitHub App tokens](docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens) with `contents: write` and `pull-requests: write` scopes.
-
-> [!TIP]  
-> If pull requests could contain changes to Actions workflows you may also need the `workflows` scope.
-
-#### branch-token
-
-The action first creates a branch, and then creates a pull request for the branch.
-For some rare use cases it can be useful, or even necessary, to use different tokens for these operations.
-It is not advisable to use this input unless you know you need to.
-
-#### commit-message
-
-In addition to a message, the `commit-message` input can also be used to populate the commit description. Leave a single blank line between the message and description.
-
-```yml
-          commit-message: |
-            the first line is the commit message
-
-            the commit description starts
-            after a blank line and can be
-            multiple lines
-```
-
-#### delete-branch
-
-The `delete-branch` feature doesn't delete branches immediately on merge. (It can't do that because it would require the merge to somehow trigger the action.)
-The intention of the feature is that when the action next runs it will delete the `branch` if there is no diff.
-
-Enabling this feature leads to the following behaviour:
-1. If a pull request was merged and the branch is left undeleted, when the action next runs it will delete the branch if there is no further diff.
-2. If a pull request is open, but there is now no longer a diff and the PR is unnecessary, the action will delete the branch causing the PR to close.
-
-If you want branches to be deleted immediately on merge then you should use GitHub's `Automatically delete head branches` feature in your repository settings.
-
-#### Proxy support
 
 For self-hosted runners behind a corporate proxy set the `https_proxy` environment variable.
 ```yml
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         env:
           https_proxy: http://<proxy_address>:<port>
 ```
@@ -142,10 +87,8 @@ The following outputs can be used by subsequent workflow steps.
 
 - `pull-request-number` - The pull request number.
 - `pull-request-url` - The URL of the pull request.
-- `pull-request-operation` - The pull request operation performed by the action, `created`, `updated`, `closed` or `none`.
+- `pull-request-operation` - The pull request operation performed by the action, `created`, `updated` or `closed`.
 - `pull-request-head-sha` - The commit SHA of the pull request branch.
-- `pull-request-branch` - The branch name of the pull request.
-- `pull-request-commits-verified` - Whether GitHub considers the signature of the branch's commits to be verified; `true` or `false`.
 
 Step outputs can be accessed as in the following example.
 Note that in order to read the step outputs the action step must have an id.
@@ -153,7 +96,7 @@ Note that in order to read the step outputs the action step must have an id.
 ```yml
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
       - name: Check outputs
         if: ${{ steps.cpr.outputs.pull-request-number }}
         run: |
@@ -172,7 +115,7 @@ How the action behaves:
 - If there are changes (i.e. a diff exists with the checked-out base branch), the changes will be pushed to a new `branch` and a pull request created.
 - If there are no changes (i.e. no diff exists with the checked-out base branch), no pull request will be created and the action exits silently.
 - If a pull request already exists it will be updated if necessary. Local changes in the Actions workspace, or changes on the base branch, can cause an update. If no update is required the action exits silently.
-- If a pull request exists and new changes on the base branch make the pull request unnecessary (i.e. there is no longer a diff between the pull request branch and the base), the pull request is automatically closed. Additionally, if [`delete-branch`](#delete-branch) is set to `true` the `branch` will be deleted.
+- If a pull request exists and new changes on the base branch make the pull request unnecessary (i.e. there is no longer a diff between the pull request branch and the base), the pull request is automatically closed. Additionally, if `delete-branch` is set to `true` the `branch` will be deleted.
 
 For further details about how the action works and usage guidelines, see [Concepts, guidelines and advanced usage](docs/concepts-guidelines.md).
 
@@ -216,7 +159,7 @@ File changes that do not match one of the paths will be stashed and restored aft
 
 ```yml
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           add-paths: |
             *.java
@@ -230,7 +173,7 @@ Note that the repository must be checked out on a branch with a remote, it won't
 
 ```yml
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Create commits
         run: |
           git config user.name 'Peter Evans'
@@ -243,7 +186,25 @@ Note that the repository must be checked out on a branch with a remote, it won't
       - name: Uncommitted change
         run: date +%s > report.txt
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
+```
+
+### Create a project card
+
+To create a project card for the pull request, pass the `pull-request-number` step output to [create-or-update-project-card](https://github.com/peter-evans/create-or-update-project-card) action.
+
+```yml
+      - name: Create Pull Request
+        id: cpr
+        uses: peter-evans/create-pull-request@v5
+
+      - name: Create or Update Project Card
+        if: ${{ steps.cpr.outputs.pull-request-number }}
+        uses: peter-evans/create-or-update-project-card@v2
+        with:
+          project-name: My project
+          column-name: My column
+          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
 ```
 
 ### Auto-merge
@@ -263,19 +224,19 @@ jobs:
   createPullRequest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Make changes to pull request
         run: date +%s > report.txt
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.PAT }}
           commit-message: Update report
-          committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
+          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           signoff: false
           branch: example-patches
           delete-branch: true

__test__/create-or-update-branch.int.test.ts

@@ -1,15 +1,14 @@
 import {
   createOrUpdateBranch,
   tryFetch,
-  getWorkingBaseAndType,
+  getWorkingBaseAndType
-  buildBranchCommits
 } from '../lib/create-or-update-branch'
 import * as fs from 'fs'
 import {GitCommandManager} from '../lib/git-command-manager'
 import * as path from 'path'
 import {v4 as uuidv4} from 'uuid'
 
-const REPO_PATH = '/git/local/repos/test-base'
+const REPO_PATH = '/git/local/test-base'
 const REMOTE_NAME = 'origin'
 
 const TRACKED_FILE = 'a/tracked-file.txt'
@@ -23,7 +22,7 @@ const INIT_COMMIT_MESSAGE = 'Add file to be a tracked file for tests'
 const BRANCH = 'tests/create-pull-request/patch'
 const BASE = DEFAULT_BRANCH
 
-const FORK_REMOTE_URL = 'git://127.0.0.1/repos/test-fork.git'
+const FORK_REMOTE_URL = 'git://127.0.0.1/test-fork.git'
 const FORK_REMOTE_NAME = 'fork'
 
 const ADD_PATHS_DEFAULT = []
@@ -141,22 +140,10 @@ describe('create-or-update-branch tests', () => {
   })
 
   async function beforeTest(): Promise<void> {
-    await git.fetch(
-      [`${DEFAULT_BRANCH}:${DEFAULT_BRANCH}`],
-      REMOTE_NAME,
-      ['--force', '--update-head-ok'],
-      true
-    )
     await git.checkout(DEFAULT_BRANCH)
   }
 
   async function afterTest(deleteRemote = true): Promise<void> {
-    await git.fetch(
-      [`${DEFAULT_BRANCH}:${DEFAULT_BRANCH}`],
-      REMOTE_NAME,
-      ['--force', '--update-head-ok'],
-      true
-    )
     await git.checkout(DEFAULT_BRANCH)
     try {
       // Get the upstream branch if it exists
@@ -211,8 +198,8 @@ describe('create-or-update-branch tests', () => {
   }
 
   it('tests if a branch exists and can be fetched', async () => {
-    expect(await tryFetch(git, REMOTE_NAME, NOT_BASE_BRANCH, 1)).toBeTruthy()
+    expect(await tryFetch(git, REMOTE_NAME, NOT_BASE_BRANCH)).toBeTruthy()
-    expect(await tryFetch(git, REMOTE_NAME, NOT_EXIST_BRANCH, 1)).toBeFalsy()
+    expect(await tryFetch(git, REMOTE_NAME, NOT_EXIST_BRANCH)).toBeFalsy()
   })
 
   it('tests getWorkingBaseAndType on a checked out ref', async () => {
@@ -230,88 +217,6 @@ describe('create-or-update-branch tests', () => {
     expect(workingBaseType).toEqual('commit')
   })
 
-  it('tests buildBranchCommits with no diff', async () => {
-    await git.checkout(BRANCH, BASE)
-    const branchCommits = await buildBranchCommits(git, BASE, BRANCH)
-    expect(branchCommits.length).toEqual(0)
-  })
-
-  it('tests buildBranchCommits with addition and modification', async () => {
-    await git.checkout(BRANCH, BASE)
-    await createChanges()
-    const UNTRACKED_EXE_FILE = 'a/script.sh'
-    const filepath = path.join(REPO_PATH, UNTRACKED_EXE_FILE)
-    await fs.promises.writeFile(filepath, '#!/usr/bin/env bash', {mode: 0o755})
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', 'Test changes'])
-
-    const branchCommits = await buildBranchCommits(git, BASE, BRANCH)
-
-    expect(branchCommits.length).toEqual(1)
-    expect(branchCommits[0].subject).toEqual('Test changes')
-    expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes[0].mode).toEqual('100755')
-    expect(branchCommits[0].changes[0].path).toEqual(UNTRACKED_EXE_FILE)
-    expect(branchCommits[0].changes[0].status).toEqual('A')
-    expect(branchCommits[0].changes[1].mode).toEqual('100644')
-    expect(branchCommits[0].changes[1].path).toEqual(TRACKED_FILE)
-    expect(branchCommits[0].changes[1].status).toEqual('M')
-    expect(branchCommits[0].changes[2].mode).toEqual('100644')
-    expect(branchCommits[0].changes[2].path).toEqual(UNTRACKED_FILE)
-    expect(branchCommits[0].changes[2].status).toEqual('A')
-  })
-
-  it('tests buildBranchCommits with addition and deletion', async () => {
-    await git.checkout(BRANCH, BASE)
-    await createChanges()
-    const TRACKED_FILE_NEW_PATH = 'c/tracked-file.txt'
-    const filepath = path.join(REPO_PATH, TRACKED_FILE_NEW_PATH)
-    await fs.promises.mkdir(path.dirname(filepath), {recursive: true})
-    await fs.promises.rename(path.join(REPO_PATH, TRACKED_FILE), filepath)
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', 'Test changes'])
-
-    const branchCommits = await buildBranchCommits(git, BASE, BRANCH)
-
-    expect(branchCommits.length).toEqual(1)
-    expect(branchCommits[0].subject).toEqual('Test changes')
-    expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes[0].mode).toEqual('100644')
-    expect(branchCommits[0].changes[0].path).toEqual(TRACKED_FILE)
-    expect(branchCommits[0].changes[0].status).toEqual('D')
-    expect(branchCommits[0].changes[1].mode).toEqual('100644')
-    expect(branchCommits[0].changes[1].path).toEqual(UNTRACKED_FILE)
-    expect(branchCommits[0].changes[1].status).toEqual('A')
-    expect(branchCommits[0].changes[2].mode).toEqual('100644')
-    expect(branchCommits[0].changes[2].path).toEqual(TRACKED_FILE_NEW_PATH)
-    expect(branchCommits[0].changes[2].status).toEqual('A')
-  })
-
-  it('tests buildBranchCommits with multiple commits', async () => {
-    await git.checkout(BRANCH, BASE)
-    for (let i = 0; i < 3; i++) {
-      await createChanges()
-      await git.exec(['add', '-A'])
-      await git.commit(['-m', `Test changes ${i}`])
-    }
-
-    const branchCommits = await buildBranchCommits(git, BASE, BRANCH)
-
-    expect(branchCommits.length).toEqual(3)
-    for (let i = 0; i < 3; i++) {
-      expect(branchCommits[i].subject).toEqual(`Test changes ${i}`)
-      expect(branchCommits[i].changes.length).toEqual(2)
-      const untrackedFileStatus = i == 0 ? 'A' : 'M'
-
-      expect(branchCommits[i].changes[0].mode).toEqual('100644')
-      expect(branchCommits[i].changes[0].path).toEqual(TRACKED_FILE)
-      expect(branchCommits[i].changes[0].status).toEqual('M')
-      expect(branchCommits[i].changes[1].mode).toEqual('100644')
-      expect(branchCommits[i].changes[1].path).toEqual(UNTRACKED_FILE)
-      expect(branchCommits[i].changes[1].status).toEqual(untrackedFileStatus)
-    }
-  })
-
   it('tests no changes resulting in no new branch being created', async () => {
     const commitMessage = uuidv4()
     const result = await createOrUpdateBranch(
@@ -668,76 +573,6 @@ describe('create-or-update-branch tests', () => {
     ).toBeTruthy()
   })
 
-  it('tests create, commit with partial changes on the base, and update', async () => {
-    // This is an edge case where the changes for a single commit are partially merged to the base
-
-    // Create tracked and untracked file changes
-    const changes = await createChanges()
-    const commitMessage = uuidv4()
-    const result = await createOrUpdateBranch(
-      git,
-      commitMessage,
-      '',
-      BRANCH,
-      REMOTE_NAME,
-      false,
-      ADD_PATHS_DEFAULT
-    )
-    await git.checkout(BRANCH)
-    expect(result.action).toEqual('created')
-    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
-    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
-    expect(
-      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
-    ).toBeTruthy()
-
-    // Push pull request branch to remote
-    await git.push([
-      '--force-with-lease',
-      REMOTE_NAME,
-      `HEAD:refs/heads/${BRANCH}`
-    ])
-
-    await afterTest(false)
-    await beforeTest()
-
-    // Create a commit on the base with a partial merge of the changes
-    await createFile(TRACKED_FILE, changes.tracked)
-    const baseCommitMessage = uuidv4()
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', baseCommitMessage])
-    await git.push([
-      '--force',
-      REMOTE_NAME,
-      `HEAD:refs/heads/${DEFAULT_BRANCH}`
-    ])
-
-    // Create the same tracked and untracked file changes
-    const _changes = await createChanges(changes.tracked, changes.untracked)
-    const _commitMessage = uuidv4()
-    const _result = await createOrUpdateBranch(
-      git,
-      _commitMessage,
-      '',
-      BRANCH,
-      REMOTE_NAME,
-      false,
-      ADD_PATHS_DEFAULT
-    )
-    await git.checkout(BRANCH)
-    expect(_result.action).toEqual('updated')
-    expect(_result.hasDiffWithBase).toBeTruthy()
-    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
-    expect(await getFileContent(UNTRACKED_FILE)).toEqual(_changes.untracked)
-    expect(
-      await gitLogMatches([
-        _commitMessage,
-        baseCommitMessage,
-        INIT_COMMIT_MESSAGE
-      ])
-    ).toBeTruthy()
-  })
-
   it('tests create, squash merge, and update with identical changes', async () => {
     // Branches that have been squash merged appear to have a diff with the base due to
     // different commits for the same changes. To prevent creating pull requests
@@ -1619,7 +1454,8 @@ describe('create-or-update-branch tests', () => {
     expect(
       await gitLogMatches([
         _commitMessage,
-        commits.commitMsgs[0] // fetch depth of base is 1
+        ...commits.commitMsgs,
+        INIT_COMMIT_MESSAGE
       ])
     ).toBeTruthy()
   })
@@ -1754,84 +1590,7 @@ describe('create-or-update-branch tests', () => {
     expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
     expect(await getFileContent(UNTRACKED_FILE)).toEqual(_changes.untracked)
     expect(
-      await gitLogMatches([
+      await gitLogMatches([...commits.commitMsgs, INIT_COMMIT_MESSAGE])
-        commits.commitMsgs[0] // fetch depth of base is 1
-      ])
-    ).toBeTruthy()
-  })
-
-  it('tests create, commit with partial changes on the base, and update (WBNB)', async () => {
-    // This is an edge case where the changes for a single commit are partially merged to the base
-
-    // Set the working base to a branch that is not the pull request base
-    await git.checkout(NOT_BASE_BRANCH)
-
-    // Create tracked and untracked file changes
-    const changes = await createChanges()
-    const commitMessage = uuidv4()
-    const result = await createOrUpdateBranch(
-      git,
-      commitMessage,
-      BASE,
-      BRANCH,
-      REMOTE_NAME,
-      false,
-      ADD_PATHS_DEFAULT
-    )
-    await git.checkout(BRANCH)
-    expect(result.action).toEqual('created')
-    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
-    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
-    expect(
-      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
-    ).toBeTruthy()
-
-    // Push pull request branch to remote
-    await git.push([
-      '--force-with-lease',
-      REMOTE_NAME,
-      `HEAD:refs/heads/${BRANCH}`
-    ])
-
-    await afterTest(false)
-    await beforeTest()
-
-    // Create a commit on the base with a partial merge of the changes
-    await createFile(TRACKED_FILE, changes.tracked)
-    const baseCommitMessage = uuidv4()
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', baseCommitMessage])
-    await git.push([
-      '--force',
-      REMOTE_NAME,
-      `HEAD:refs/heads/${DEFAULT_BRANCH}`
-    ])
-
-    // Set the working base to a branch that is not the pull request base
-    await git.checkout(NOT_BASE_BRANCH)
-
-    // Create the same tracked and untracked file changes
-    const _changes = await createChanges(changes.tracked, changes.untracked)
-    const _commitMessage = uuidv4()
-    const _result = await createOrUpdateBranch(
-      git,
-      _commitMessage,
-      BASE,
-      BRANCH,
-      REMOTE_NAME,
-      false,
-      ADD_PATHS_DEFAULT
-    )
-    await git.checkout(BRANCH)
-    expect(_result.action).toEqual('updated')
-    expect(_result.hasDiffWithBase).toBeTruthy()
-    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
-    expect(await getFileContent(UNTRACKED_FILE)).toEqual(_changes.untracked)
-    expect(
-      await gitLogMatches([
-        _commitMessage,
-        baseCommitMessage // fetch depth of base is 1
-      ])
     ).toBeTruthy()
   })
 
@@ -1909,9 +1668,7 @@ describe('create-or-update-branch tests', () => {
     expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
     expect(await getFileContent(UNTRACKED_FILE)).toEqual(_changes.untracked)
     expect(
-      await gitLogMatches([
+      await gitLogMatches([...commits.commitMsgs, INIT_COMMIT_MESSAGE])
-        commits.commitMsgs[0] // fetch depth of base is 1
-      ])
     ).toBeTruthy()
   })
 
@@ -2194,7 +1951,8 @@ describe('create-or-update-branch tests', () => {
       await gitLogMatches([
         _commitMessage,
         ..._commits.commitMsgs,
-        commitsOnBase.commitMsgs[0] // fetch depth of base is 1
+        ...commitsOnBase.commitMsgs,
+        INIT_COMMIT_MESSAGE
       ])
     ).toBeTruthy()
   })
@@ -2389,7 +2147,8 @@ describe('create-or-update-branch tests', () => {
     expect(
       await gitLogMatches([
         _commitMessage,
-        commitsOnBase.commitMsgs[0] // fetch depth of base is 1
+        ...commitsOnBase.commitMsgs,
+        INIT_COMMIT_MESSAGE
       ])
     ).toBeTruthy()
   })

__test__/entrypoint.sh

@@ -5,31 +5,23 @@ set -euo pipefail
 WORKINGDIR=$PWD
 
 # Create and serve a remote repo
-mkdir -p /git/remote/repos
+mkdir -p /git/remote
 git config --global init.defaultBranch main
-git init --bare /git/remote/repos/test-base.git
+git init --bare /git/remote/test-base.git
 git daemon --verbose --enable=receive-pack --base-path=/git/remote --export-all /git/remote &>/dev/null &
 
 # Give the daemon time to start
 sleep 2
 
-# Create a local clone and make initial commits
+# Create a local clone and make an initial commit
-mkdir -p /git/local/repos
+mkdir -p /git/local
-git clone git://127.0.0.1/repos/test-base.git /git/local/repos/test-base
+git clone git://127.0.0.1/test-base.git /git/local/test-base
-cd /git/local/repos/test-base
+cd /git/local/test-base
 git config --global user.email "you@example.com"
 git config --global user.name "Your Name"
-echo "#test-base" > README_TEMP.md
+echo "#test-base" > README.md
 git add .
 git commit -m "initial commit"
-git commit --allow-empty -m "empty commit for tests"
-echo "#test-base :sparkles:" > README_TEMP.md
-git add .
-git commit -m "add sparkles" -m "Change description:
-- updates README_TEMP.md to add sparkles to the title"
-mv README_TEMP.md README.md
-git add .
-git commit -m "rename readme"
 git push -u
 git log -1 --pretty=oneline
 git config --global --unset user.email
@@ -38,8 +30,8 @@ git config -l
 
 # Clone a server-side fork of the base repo
 cd $WORKINGDIR
-git clone --mirror git://127.0.0.1/repos/test-base.git /git/remote/repos/test-fork.git
+git clone --mirror git://127.0.0.1/test-base.git /git/remote/test-fork.git
-cd /git/remote/repos/test-fork.git
+cd /git/remote/test-fork.git
 git log -1 --pretty=oneline
 
 # Restore the working directory

__test__/git-auth-helper.int.test.ts

@@ -1,31 +1,32 @@
 import {GitCommandManager} from '../lib/git-command-manager'
-import {GitConfigHelper} from '../lib/git-config-helper'
+import {GitAuthHelper} from '../lib/git-auth-helper'
 
-const REPO_PATH = '/git/local/repos/test-base'
+const REPO_PATH = '/git/local/test-base'
 
-const extraheaderConfigKey = 'http.https://127.0.0.1/.extraheader'
+const extraheaderConfigKey = 'http.https://github.com/.extraheader'
 
-describe('git-config-helper integration tests', () => {
+describe('git-auth-helper tests', () => {
   let git: GitCommandManager
+  let gitAuthHelper: GitAuthHelper
 
   beforeAll(async () => {
     git = await GitCommandManager.create(REPO_PATH)
+    gitAuthHelper = new GitAuthHelper(git)
   })
 
   it('tests save and restore with no persisted auth', async () => {
-    const gitConfigHelper = await GitConfigHelper.create(git)
+    await gitAuthHelper.savePersistedAuth()
-    await gitConfigHelper.close()
+    await gitAuthHelper.restorePersistedAuth()
   })
 
   it('tests configure and removal of auth', async () => {
-    const gitConfigHelper = await GitConfigHelper.create(git)
+    await gitAuthHelper.configureToken('github-token')
-    await gitConfigHelper.configureToken('github-token')
     expect(await git.configExists(extraheaderConfigKey)).toBeTruthy()
     expect(await git.getConfigValue(extraheaderConfigKey)).toEqual(
       'AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2l0aHViLXRva2Vu'
     )
 
-    await gitConfigHelper.close()
+    await gitAuthHelper.removeAuth()
     expect(await git.configExists(extraheaderConfigKey)).toBeFalsy()
   })
 
@@ -33,53 +34,37 @@ describe('git-config-helper integration tests', () => {
     const extraheaderConfigValue = 'AUTHORIZATION: basic ***persisted-auth***'
     await git.config(extraheaderConfigKey, extraheaderConfigValue)
 
-    const gitConfigHelper = await GitConfigHelper.create(git)
+    await gitAuthHelper.savePersistedAuth()
 
     const exists = await git.configExists(extraheaderConfigKey)
     expect(exists).toBeFalsy()
 
-    await gitConfigHelper.close()
+    await gitAuthHelper.restorePersistedAuth()
 
     const configValue = await git.getConfigValue(extraheaderConfigKey)
     expect(configValue).toEqual(extraheaderConfigValue)
 
-    const unset = await git.tryConfigUnset(
+    await gitAuthHelper.removeAuth()
-      extraheaderConfigKey,
-      '^AUTHORIZATION:'
-    )
-    expect(unset).toBeTruthy()
-  })
-
-  it('tests not adding/removing the safe.directory config when it already exists', async () => {
-    await git.config('safe.directory', '/another-value', true, true)
-
-    const gitConfigHelper = await GitConfigHelper.create(git)
-
-    expect(
-      await git.configExists('safe.directory', '/another-value', true)
-    ).toBeTruthy()
-
-    await gitConfigHelper.close()
-
-    const unset = await git.tryConfigUnset(
-      'safe.directory',
-      '/another-value',
-      true
-    )
-    expect(unset).toBeTruthy()
   })
 
   it('tests adding and removing the safe.directory config', async () => {
-    const gitConfigHelper = await GitConfigHelper.create(git)
+    await git.config('safe.directory', '/another-value', true, true)
+
+    await gitAuthHelper.removeSafeDirectory()
+    await gitAuthHelper.addSafeDirectory()
 
     expect(
       await git.configExists('safe.directory', REPO_PATH, true)
     ).toBeTruthy()
 
-    await gitConfigHelper.close()
+    await gitAuthHelper.addSafeDirectory()
+    await gitAuthHelper.removeSafeDirectory()
 
     expect(
       await git.configExists('safe.directory', REPO_PATH, true)
     ).toBeFalsy()
+    expect(
+      await git.configExists('safe.directory', '/another-value', true)
+    ).toBeTruthy()
   })
 })

__test__/git-command-manager.int.test.ts

@@ -1,48 +0,0 @@
-import {GitCommandManager} from '../lib/git-command-manager'
-
-const REPO_PATH = '/git/local/repos/test-base'
-
-describe('git-command-manager integration tests', () => {
-  let git: GitCommandManager
-
-  beforeAll(async () => {
-    git = await GitCommandManager.create(REPO_PATH)
-    await git.checkout('main')
-  })
-
-  it('tests getCommit', async () => {
-    const initialCommit = await git.getCommit('HEAD^^^')
-    const emptyCommit = await git.getCommit('HEAD^^')
-    const modifiedCommit = await git.getCommit('HEAD^')
-    const headCommit = await git.getCommit('HEAD')
-
-    expect(initialCommit.subject).toEqual('initial commit')
-    expect(initialCommit.signed).toBeFalsy()
-    expect(initialCommit.changes[0].mode).toEqual('100644')
-    expect(initialCommit.changes[0].status).toEqual('A')
-    expect(initialCommit.changes[0].path).toEqual('README_TEMP.md')
-
-    expect(emptyCommit.subject).toEqual('empty commit for tests')
-    expect(emptyCommit.tree).toEqual(initialCommit.tree) // empty commits have no tree and reference the parent's
-    expect(emptyCommit.parents[0]).toEqual(initialCommit.sha)
-    expect(emptyCommit.signed).toBeFalsy()
-    expect(emptyCommit.changes).toEqual([])
-
-    expect(modifiedCommit.subject).toEqual('add sparkles')
-    expect(modifiedCommit.parents[0]).toEqual(emptyCommit.sha)
-    expect(modifiedCommit.signed).toBeFalsy()
-    expect(modifiedCommit.changes[0].mode).toEqual('100644')
-    expect(modifiedCommit.changes[0].status).toEqual('M')
-    expect(modifiedCommit.changes[0].path).toEqual('README_TEMP.md')
-
-    expect(headCommit.subject).toEqual('rename readme')
-    expect(headCommit.parents[0]).toEqual(modifiedCommit.sha)
-    expect(headCommit.signed).toBeFalsy()
-    expect(headCommit.changes[0].mode).toEqual('100644')
-    expect(headCommit.changes[0].status).toEqual('A')
-    expect(headCommit.changes[0].path).toEqual('README.md')
-    expect(headCommit.changes[1].mode).toEqual('100644')
-    expect(headCommit.changes[1].status).toEqual('D')
-    expect(headCommit.changes[1].path).toEqual('README_TEMP.md')
-  })
-})

__test__/git-config-helper.unit.test.ts

@@ -1,93 +0,0 @@
-import {GitConfigHelper} from '../lib/git-config-helper'
-
-describe('git-config-helper unit tests', () => {
-  test('parseGitRemote successfully parses HTTPS remote URLs', async () => {
-    const remote1 = GitConfigHelper.parseGitRemote(
-      'https://github.com/peter-evans/create-pull-request'
-    )
-    expect(remote1.hostname).toEqual('github.com')
-    expect(remote1.protocol).toEqual('HTTPS')
-    expect(remote1.repository).toEqual('peter-evans/create-pull-request')
-
-    const remote2 = GitConfigHelper.parseGitRemote(
-      'https://xxx:x-oauth-basic@github.com/peter-evans/create-pull-request'
-    )
-    expect(remote2.hostname).toEqual('github.com')
-    expect(remote2.protocol).toEqual('HTTPS')
-    expect(remote2.repository).toEqual('peter-evans/create-pull-request')
-
-    const remote3 = GitConfigHelper.parseGitRemote(
-      'https://github.com/peter-evans/create-pull-request.git'
-    )
-    expect(remote3.hostname).toEqual('github.com')
-    expect(remote3.protocol).toEqual('HTTPS')
-    expect(remote3.repository).toEqual('peter-evans/create-pull-request')
-
-    const remote4 = GitConfigHelper.parseGitRemote(
-      'https://github.com/peter-evans/ungit'
-    )
-    expect(remote4.hostname).toEqual('github.com')
-    expect(remote4.protocol).toEqual('HTTPS')
-    expect(remote4.repository).toEqual('peter-evans/ungit')
-
-    const remote5 = GitConfigHelper.parseGitRemote(
-      'https://github.com/peter-evans/ungit.git'
-    )
-    expect(remote5.hostname).toEqual('github.com')
-    expect(remote5.protocol).toEqual('HTTPS')
-    expect(remote5.repository).toEqual('peter-evans/ungit')
-
-    const remote6 = GitConfigHelper.parseGitRemote(
-      'https://github.internal.company/peter-evans/create-pull-request'
-    )
-    expect(remote6.hostname).toEqual('github.internal.company')
-    expect(remote6.protocol).toEqual('HTTPS')
-    expect(remote6.repository).toEqual('peter-evans/create-pull-request')
-  })
-
-  test('parseGitRemote successfully parses SSH remote URLs', async () => {
-    const remote1 = GitConfigHelper.parseGitRemote(
-      'git@github.com:peter-evans/create-pull-request.git'
-    )
-    expect(remote1.hostname).toEqual('github.com')
-    expect(remote1.protocol).toEqual('SSH')
-    expect(remote1.repository).toEqual('peter-evans/create-pull-request')
-
-    const remote2 = GitConfigHelper.parseGitRemote(
-      'git@github.com:peter-evans/ungit.git'
-    )
-    expect(remote2.hostname).toEqual('github.com')
-    expect(remote2.protocol).toEqual('SSH')
-    expect(remote2.repository).toEqual('peter-evans/ungit')
-
-    const remote3 = GitConfigHelper.parseGitRemote(
-      'git@github.internal.company:peter-evans/create-pull-request.git'
-    )
-    expect(remote3.hostname).toEqual('github.internal.company')
-    expect(remote3.protocol).toEqual('SSH')
-    expect(remote3.repository).toEqual('peter-evans/create-pull-request')
-  })
-
-  test('parseGitRemote successfully parses GIT remote URLs', async () => {
-    // Unauthenticated git protocol for integration tests only
-    const remote1 = GitConfigHelper.parseGitRemote(
-      'git://127.0.0.1/repos/test-base.git'
-    )
-    expect(remote1.hostname).toEqual('127.0.0.1')
-    expect(remote1.protocol).toEqual('GIT')
-    expect(remote1.repository).toEqual('repos/test-base')
-  })
-
-  test('parseGitRemote fails to parse a remote URL', async () => {
-    const remoteUrl = 'https://github.com/peter-evans'
-    try {
-      GitConfigHelper.parseGitRemote(remoteUrl)
-      // Fail the test if an error wasn't thrown
-      expect(true).toEqual(false)
-    } catch (e: any) {
-      expect(e.message).toEqual(
-        `The format of '${remoteUrl}' is not a valid GitHub repository URL`
-      )
-    }
-  })
-})

__test__/integration-tests.sh

@@ -8,7 +8,7 @@ if [[ "$(docker images -q $IMAGE 2> /dev/null)" == "" || $ARG1 == "build" ]]; th
     echo "Building Docker image $IMAGE ..."
 
     cat > Dockerfile << EOF
-FROM node:20-alpine
+FROM node:16-alpine
 RUN apk --no-cache add git git-daemon
 RUN npm install jest jest-environment-jsdom --global
 WORKDIR /cpr

__test__/utils.unit.test.ts

@@ -44,6 +44,63 @@ describe('utils tests', () => {
     )
   })
 
+  test('getRemoteDetail successfully parses remote URLs', async () => {
+    const remote1 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/create-pull-request'
+    )
+    expect(remote1.protocol).toEqual('HTTPS')
+    expect(remote1.repository).toEqual('peter-evans/create-pull-request')
+
+    const remote2 = utils.getRemoteDetail(
+      'https://xxx:x-oauth-basic@github.com/peter-evans/create-pull-request'
+    )
+    expect(remote2.protocol).toEqual('HTTPS')
+    expect(remote2.repository).toEqual('peter-evans/create-pull-request')
+
+    const remote3 = utils.getRemoteDetail(
+      'git@github.com:peter-evans/create-pull-request.git'
+    )
+    expect(remote3.protocol).toEqual('SSH')
+    expect(remote3.repository).toEqual('peter-evans/create-pull-request')
+
+    const remote4 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/create-pull-request.git'
+    )
+    expect(remote4.protocol).toEqual('HTTPS')
+    expect(remote4.repository).toEqual('peter-evans/create-pull-request')
+
+    const remote5 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/ungit'
+    )
+    expect(remote5.protocol).toEqual('HTTPS')
+    expect(remote5.repository).toEqual('peter-evans/ungit')
+
+    const remote6 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/ungit.git'
+    )
+    expect(remote6.protocol).toEqual('HTTPS')
+    expect(remote6.repository).toEqual('peter-evans/ungit')
+
+    const remote7 = utils.getRemoteDetail(
+      'git@github.com:peter-evans/ungit.git'
+    )
+    expect(remote7.protocol).toEqual('SSH')
+    expect(remote7.repository).toEqual('peter-evans/ungit')
+  })
+
+  test('getRemoteDetail fails to parse a remote URL', async () => {
+    const remoteUrl = 'https://github.com/peter-evans'
+    try {
+      utils.getRemoteDetail(remoteUrl)
+      // Fail the test if an error wasn't thrown
+      expect(true).toEqual(false)
+    } catch (e: any) {
+      expect(e.message).toEqual(
+        `The format of '${remoteUrl}' is not a valid GitHub repository URL`
+      )
+    }
+  })
+
   test('getRemoteUrl successfully returns remote URLs', async () => {
     const url1 = utils.getRemoteUrl(
       'HTTPS',

action.yml

@@ -2,12 +2,8 @@ name: 'Create Pull Request'
 description: 'Creates a pull request for changes to your repository in the actions workspace'
 inputs:
   token:
-    description: 'The token that the action will use to create and update the pull request.'
+    description: 'GITHUB_TOKEN or a `repo` scoped Personal Access Token (PAT)'
     default: ${{ github.token }}
-  branch-token:
-    description: >
-      The token that the action will use to create and update the branch.
-      Defaults to the value of `token`.
   path:
     description: >
       Relative path under $GITHUB_WORKSPACE to the repository.
@@ -24,12 +20,12 @@ inputs:
     description: >
       The committer name and email address in the format `Display Name <email@address.com>`.
       Defaults to the GitHub Actions bot user.
-    default: 'github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>'
+    default: 'GitHub <noreply@github.com>'
   author:
     description: >
       The author name and email address in the format `Display Name <email@address.com>`.
       Defaults to the user who triggered the workflow run.
-    default: '${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>'
+    default: '${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>'
   signoff:
     description: 'Add `Signed-off-by` line by the committer at the end of the commit log message.'
     default: false
@@ -38,7 +34,8 @@ inputs:
     default: 'create-pull-request/patch'
   delete-branch:
     description: >
-      Delete the `branch` if it doesn't have an active pull request associated with it.
+      Delete the `branch` when closing pull requests, and when undeleted after merging.
+      Recommend `true`.
     default: false
   branch-suffix:
     description: 'The branch suffix type when using the alternative branching strategy.'
@@ -51,9 +48,6 @@ inputs:
       A fork of the checked out parent repository to which the pull request branch will be pushed.
       e.g. `owner/repo-fork`.
       The pull request will be created to merge the fork's branch into the parent's base.
-  sign-commits:
-    description: 'Sign commits as `github-actions[bot]` when using `GITHUB_TOKEN`, or your own bot when using GitHub App tokens.'
-    default: false
   title:
     description: 'The title of the pull request.'
     default: 'Changes by create-pull-request action'
@@ -75,13 +69,8 @@ inputs:
   milestone:
     description: 'The number of the milestone to associate the pull request with.'
   draft:
-    description: >
+    description: 'Create a draft pull request. It is not possible to change draft status after creation except through the web interface'
-      Create a draft pull request.
-      Valid values are `true` (only on create), `always-true` (on create and update), and `false`.
     default: false
-  maintainer-can-modify:
-    description: 'Indicates whether maintainers can modify the pull request.'
-    default: true
 outputs:
   pull-request-number:
     description: 'The pull request number'
@@ -91,10 +80,8 @@ outputs:
     description: 'The pull request operation performed by the action, `created`, `updated` or `closed`.'
   pull-request-head-sha:
     description: 'The commit SHA of the pull request branch.'
-  pull-request-branch:
-    description: 'The pull request branch name'
 runs:
-  using: 'node20'
+  using: 'node16'
   main: 'dist/index.js'
 branding:
   icon: 'git-pull-request'

dist/790.index.js

@@ -1,16 +0,0 @@
-"use strict";
-exports.id = 790;
-exports.ids = [790];
-exports.modules = {
-
-/***/ 790:
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
-
-var y=Object.defineProperty;var c=(R,o)=>y(R,"name",{value:o,configurable:!0});__webpack_require__(3024),__webpack_require__(6760);const node=__webpack_require__(117);__webpack_require__(7067),__webpack_require__(4708),__webpack_require__(8522),__webpack_require__(7075),__webpack_require__(4573),__webpack_require__(7975),__webpack_require__(7713),__webpack_require__(3136),__webpack_require__(7030);let s=0;const S={START_BOUNDARY:s++,HEADER_FIELD_START:s++,HEADER_FIELD:s++,HEADER_VALUE_START:s++,HEADER_VALUE:s++,HEADER_VALUE_ALMOST_DONE:s++,HEADERS_ALMOST_DONE:s++,PART_DATA_START:s++,PART_DATA:s++,END:s++};let f=1;const F={PART_BOUNDARY:f,LAST_BOUNDARY:f*=2},LF=10,CR=13,SPACE=32,HYPHEN=45,COLON=58,A=97,Z=122,lower=c(R=>R|32,"lower"),noop=c(()=>{},"noop"),g=class g{constructor(o){this.index=0,this.flags=0,this.onHeaderEnd=noop,this.onHeaderField=noop,this.onHeadersEnd=noop,this.onHeaderValue=noop,this.onPartBegin=noop,this.onPartData=noop,this.onPartEnd=noop,this.boundaryChars={},o=`\r
---`+o;const t=new Uint8Array(o.length);for(let n=0;n<o.length;n++)t[n]=o.charCodeAt(n),this.boundaryChars[t[n]]=!0;this.boundary=t,this.lookbehind=new Uint8Array(this.boundary.length+8),this.state=S.START_BOUNDARY}write(o){let t=0;const n=o.length;let E=this.index,{lookbehind:l,boundary:h,boundaryChars:H,index:e,state:a,flags:d}=this;const b=this.boundary.length,m=b-1,O=o.length;let r,P;const u=c(D=>{this[D+"Mark"]=t},"mark"),i=c(D=>{delete this[D+"Mark"]},"clear"),T=c((D,p,_,N)=>{(p===void 0||p!==_)&&this[D](N&&N.subarray(p,_))},"callback"),L=c((D,p)=>{const _=D+"Mark";_ in this&&(p?(T(D,this[_],t,o),delete this[_]):(T(D,this[_],o.length,o),this[_]=0))},"dataCallback");for(t=0;t<n;t++)switch(r=o[t],a){case S.START_BOUNDARY:if(e===h.length-2){if(r===HYPHEN)d|=F.LAST_BOUNDARY;else if(r!==CR)return;e++;break}else if(e-1===h.length-2){if(d&F.LAST_BOUNDARY&&r===HYPHEN)a=S.END,d=0;else if(!(d&F.LAST_BOUNDARY)&&r===LF)e=0,T("onPartBegin"),a=S.HEADER_FIELD_START;else return;break}r!==h[e+2]&&(e=-2),r===h[e+2]&&e++;break;case S.HEADER_FIELD_START:a=S.HEADER_FIELD,u("onHeaderField"),e=0;case S.HEADER_FIELD:if(r===CR){i("onHeaderField"),a=S.HEADERS_ALMOST_DONE;break}if(e++,r===HYPHEN)break;if(r===COLON){if(e===1)return;L("onHeaderField",!0),a=S.HEADER_VALUE_START;break}if(P=lower(r),P<A||P>Z)return;break;case S.HEADER_VALUE_START:if(r===SPACE)break;u("onHeaderValue"),a=S.HEADER_VALUE;case S.HEADER_VALUE:r===CR&&(L("onHeaderValue",!0),T("onHeaderEnd"),a=S.HEADER_VALUE_ALMOST_DONE);break;case S.HEADER_VALUE_ALMOST_DONE:if(r!==LF)return;a=S.HEADER_FIELD_START;break;case S.HEADERS_ALMOST_DONE:if(r!==LF)return;T("onHeadersEnd"),a=S.PART_DATA_START;break;case S.PART_DATA_START:a=S.PART_DATA,u("onPartData");case S.PART_DATA:if(E=e,e===0){for(t+=m;t<O&&!(o[t]in H);)t+=b;t-=m,r=o[t]}if(e<h.length)h[e]===r?(e===0&&L("onPartData",!0),e++):e=0;else if(e===h.length)e++,r===CR?d|=F.PART_BOUNDARY:r===HYPHEN?d|=F.LAST_BOUNDARY:e=0;else if(e-1===h.length)if(d&F.PART_BOUNDARY){if(e=0,r===LF){d&=~F.PART_BOUNDARY,T("onPartEnd"),T("onPartBegin"),a=S.HEADER_FIELD_START;break}}else d&F.LAST_BOUNDARY&&r===HYPHEN?(T("onPartEnd"),a=S.END,d=0):e=0;if(e>0)l[e-1]=r;else if(E>0){const D=new Uint8Array(l.buffer,l.byteOffset,l.byteLength);T("onPartData",0,E,D),E=0,u("onPartData"),t--}break;case S.END:break;default:throw new Error(`Unexpected state entered: ${a}`)}L("onHeaderField"),L("onHeaderValue"),L("onPartData"),this.index=e,this.state=a,this.flags=d}end(){if(this.state===S.HEADER_FIELD_START&&this.index===0||this.state===S.PART_DATA&&this.index===this.boundary.length)this.onPartEnd();else if(this.state!==S.END)throw new Error("MultipartParser.end(): stream ended unexpectedly")}};c(g,"MultipartParser");let MultipartParser=g;function _fileName(R){const o=R.match(/\bfilename=("(.*?)"|([^()<>@,;:\\"/[\]?={}\s\t]+))($|;\s)/i);if(!o)return;const t=o[2]||o[3]||"";let n=t.slice(t.lastIndexOf("\\")+1);return n=n.replace(/%22/g,'"'),n=n.replace(/&#(\d{4});/g,(E,l)=>String.fromCharCode(l)),n}c(_fileName,"_fileName");async function toFormData(R,o){if(!/multipart/i.test(o))throw new TypeError("Failed to fetch");const t=o.match(/boundary=(?:"([^"]+)"|([^;]+))/i);if(!t)throw new TypeError("no or bad content-type header, no multipart boundary");const n=new MultipartParser(t[1]||t[2]);let E,l,h,H,e,a;const d=[],b=new node.FormData,m=c(i=>{h+=u.decode(i,{stream:!0})},"onPartData"),O=c(i=>{d.push(i)},"appendToFile"),r=c(()=>{const i=new node.File(d,a,{type:e});b.append(H,i)},"appendFileToFormData"),P=c(()=>{b.append(H,h)},"appendEntryToFormData"),u=new TextDecoder("utf-8");u.decode(),n.onPartBegin=function(){n.onPartData=m,n.onPartEnd=P,E="",l="",h="",H="",e="",a=null,d.length=0},n.onHeaderField=function(i){E+=u.decode(i,{stream:!0})},n.onHeaderValue=function(i){l+=u.decode(i,{stream:!0})},n.onHeaderEnd=function(){if(l+=u.decode(),E=E.toLowerCase(),E==="content-disposition"){const i=l.match(/\bname=("([^"]*)"|([^()<>@,;:\\"/[\]?={}\s\t]+))/i);i&&(H=i[2]||i[3]||""),a=_fileName(l),a&&(n.onPartData=O,n.onPartEnd=r)}else E==="content-type"&&(e=l);l="",E=""};for await(const i of R)n.write(i);return n.end(),b}c(toFormData,"toFormData"),exports.toFormData=toFormData;
-
-
-/***/ })
-
-};
-;

docs/common-issues.md

@@ -1,53 +0,0 @@
-# Common issues
-
-- [Troubleshooting](#troubleshooting)
-  - [Create using an existing branch as the PR branch](#create-using-an-existing-branch-as-the-pr-branch)
-- [Frequently requested features](#use-case-create-a-pull-request-to-update-x-on-release)
-  - [Disable force updates to existing PR branches](#disable-force-updates-to-existing-pr-branches)
-  - [Add a no-verify option to bypass git hooks](#add-a-no-verify-option-to-bypass-git-hooks)
-
-## Troubleshooting
-
-### Create using an existing branch as the PR branch
-
-A common point of confusion is to try and use an existing branch containing changes to raise in a PR as the `branch` input. This will not work because the action is primarily designed to be used in workflows where the PR branch does not exist yet. The action creates and manages the PR branch itself.
-
-If you have an existing branch that you just want to create a PR for, then I recommend using the official [GitHub CLI](https://cli.github.com/manual/gh_pr_create) in a workflow step.
-
-Alternatively, if you are trying to keep a branch up to date with another branch, then you can follow [this example](https://github.com/peter-evans/create-pull-request/blob/main/docs/examples.md#keep-a-branch-up-to-date-with-another).
-
-## Frequently requested features
-
-### Disable force updates to existing PR branches
-
-This behaviour is fundamental to how the action works and is a conscious design decision. The "rule" that I based this design on is that when a workflow executes the action to create or update a PR, the result of those two possible actions should never be different. The easiest way to maintain that consistency is to rebase the PR branch and force push it.
-
-If you want to avoid this behaviour there are some things that might work depending on your use case:
-- Check if the pull request branch exists in a separate step before the action runs and act accordingly.
-- Use the [alternative strategy](https://github.com/peter-evans/create-pull-request#alternative-strategy---always-create-a-new-pull-request-branch) of always creating a new PR that won't be updated by the action.
-- [Create your own commits](https://github.com/peter-evans/create-pull-request#create-your-own-commits) each time the action is created/updated.
-
-### Add a no-verify option to bypass git hooks
-
-Presently, there is no plan to add this feature to the action.
-The reason is that I'm trying very hard to keep the interface for this action to a minimum to prevent it becoming bloated and complicated.
-
-Git hooks must be installed after a repository is checked out in order for them to work.
-So the straightforward solution is to just not install them during the workflow where this action is used.
-
-- If hooks are automatically enabled by a framework, use an option provided by the framework to disable them. For example, for Husky users, they can be disabled with the `--ignore-scripts` flag, or by setting the `HUSKY` environment variable when the action runs.
-  ```yml
-  uses: peter-evans/create-pull-request@v7
-  env:
-    HUSKY: '0'
-  ```
-- If hooks are installed in a script, then add a condition checking if the `CI` environment variable exists.
-   ```sh
-   #!/bin/sh
-
-   [ -n "$CI" ] && exit 0
-   ```
-- If preventing the hooks installing is problematic, just delete them in a workflow step before the action runs.
-   ```yml
-   - run: rm .git/hooks -rf
-   ```

docs/concepts-guidelines.md

@@ -15,11 +15,7 @@ This document covers terminology, how the action works, general usage guidelines
   - [Creating pull requests in a remote repository](#creating-pull-requests-in-a-remote-repository)
   - [Push using SSH (deploy keys)](#push-using-ssh-deploy-keys)
   - [Push pull request branches to a fork](#push-pull-request-branches-to-a-fork)
-    - [Pushing to a fork with fine-grained permissions](#pushing-to-a-fork-with-fine-grained-permissions)
   - [Authenticating with GitHub App generated tokens](#authenticating-with-github-app-generated-tokens)
-    - [Creating pull requests in a remote repository using GitHub App generated tokens](#creating-pull-requests-in-a-remote-repository-using-github-app-generated-tokens)
-  - [Commit signing](#commit-signing)
-    - [Commit signature verification for bots](#commit-signature-verification-for-bots)
   - [GPG commit signature verification](#gpg-commit-signature-verification)
   - [Running in a container or on self-hosted runners](#running-in-a-container-or-on-self-hosted-runners)
 
@@ -40,7 +36,7 @@ For each [event type](https://docs.github.com/en/actions/reference/events-that-t
 The default can be overridden by specifying a `ref` on checkout.
 
 ```yml
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: develop
 ```
@@ -77,7 +73,7 @@ jobs:
   example:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 ```
 
 There may be use cases where it makes sense to execute the workflow on a branch that is not the base of the pull request. In these cases, the base branch can be specified with the `base` action input. The action will attempt to rebase changes made during the workflow on to the actual base.
@@ -92,7 +88,7 @@ In these cases, you *must supply* the `base` input so the action can rebase chan
 Workflows triggered by [`pull_request`](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request) events will by default check out a merge commit. Set the `base` input as follows to base the new pull request on the current pull request's branch.
 
 ```yml
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v5
         with:
           base: ${{ github.head_ref }}
 ```
@@ -100,7 +96,7 @@ Workflows triggered by [`pull_request`](https://docs.github.com/en/actions/refer
 Workflows triggered by [`release`](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#release) events will by default check out a tag. For most use cases, you will need to set the `base` input to the branch name of the tagged commit.
 
 ```yml
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v5
         with:
           base: main
 ```
@@ -150,15 +146,13 @@ There are a number of workarounds with different pros and cons.
 
 - Use the default `GITHUB_TOKEN` and allow the action to create pull requests that have no checks enabled. Manually close pull requests and immediately reopen them. This will enable `on: pull_request` workflows to run and be added as checks. To prevent merging of pull requests without checks erroneously, use [branch protection rules](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests).
 
-- Create draft pull requests by setting the `draft: always-true` input, and configure your workflow to trigger `on: ready_for_review`. The workflow will run when users manually click the "Ready for review" button on the draft pull requests. If the pull request is updated by the action, the `always-true` mode ensures that the pull request will be converted back to a draft.
+- Use a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) created on an account that has write access to the repository that pull requests are being created in. This is the standard workaround and [recommended by GitHub](https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). However, the PAT cannot be scoped to a specific repository so the token becomes a very sensitive secret. If this is a concern, the PAT can instead be created for a dedicated [machine account](https://docs.github.com/en/github/site-policy/github-terms-of-service#3-account-requirements) that has collaborator access to the repository. Also note that because the account that owns the PAT will be the creator of pull requests, that user account will be unable to perform actions such as request changes or approve the pull request.
-
-- Use a [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) created on an account that has write access to the repository that pull requests are being created in. This is the standard workaround and [recommended by GitHub](https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). It's advisable to use a dedicated [machine account](https://docs.github.com/en/github/site-policy/github-terms-of-service#3-account-requirements) that has collaborator access to the repository, rather than creating a PAT on a personal user account. Also note that because the account that owns the PAT will be the creator of pull requests, that user account will be unable to perform actions such as request changes or approve the pull request.
 
 - Use [SSH (deploy keys)](#push-using-ssh-deploy-keys) to push the pull request branch. This is arguably more secure than using a PAT because deploy keys can be set per repository. However, this method will only trigger `on: push` workflows.
 
 - Use a [machine account that creates pull requests from its own fork](#push-pull-request-branches-to-a-fork). This is the most secure because the PAT created only grants access to the machine account's fork, not the main repository. This method will trigger `on: pull_request` workflows to run. Workflows triggered `on: push` will not run because the push event is in the fork.
 
-- Use a [GitHub App to generate a token](#authenticating-with-github-app-generated-tokens) that can be used with this action. GitHub App generated tokens are more secure than using a Classic PAT because access permissions can be set with finer granularity and are scoped to only repositories where the App is installed. This method will trigger both `on: push` and `on: pull_request` workflows.
+- Use a [GitHub App to generate a token](#authenticating-with-github-app-generated-tokens) that can be used with this action. GitHub App generated tokens are more secure than using a PAT because GitHub App access permissions can be set with finer granularity and are scoped to only repositories where the App is installed. This method will trigger both `on: push` and `on: pull_request` workflows.
 
 ### Security
 
@@ -176,29 +170,26 @@ This action uses [ncc](https://github.com/vercel/ncc) to compile the Node.js cod
 
 ### Creating pull requests in a remote repository
 
-Checking out a branch from a different repository from where the workflow is executing will make *that repository* the target for the created pull request. In this case, the `GITHUB_TOKEN` will not work and one of the other [token options](../README.md#token) must be used.
+Checking out a branch from a different repository from where the workflow is executing will make *that repository* the target for the created pull request. In this case, a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) is required.
 
 ```yml
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           token: ${{ secrets.PAT }}
           repository: owner/repo
 
       # Make changes to pull request here
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.PAT }}
 ```
 
 ### Push using SSH (deploy keys)
 
-[Deploy keys](https://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys) can be set per repository and so are arguably more secure than using a Classic [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
+[Deploy keys](https://developer.github.com/v3/guides/managing-deploy-keys/#deploy-keys) can be set per repository and so are arguably more secure than using a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
 Allowing the action to push with a configured deploy key will trigger `on: push` workflows. This makes it an alternative to using a PAT to trigger checks for pull requests.
-
+Note that you cannot use deploy keys alone to [create a pull request in a remote repository](#creating-pull-requests-in-a-remote-repository) because then using a PAT would become a requirement. This method only makes sense if creating a pull request in the repository where the workflow is running.
-> [!NOTE]
-> You cannot use deploy keys alone to [create a pull request in a remote repository](#creating-pull-requests-in-a-remote-repository) because then using a PAT would become a requirement.
-> This method only makes sense if creating a pull request in the repository where the workflow is running.
 
 How to use SSH (deploy keys) with create-pull-request action:
 
@@ -209,14 +200,14 @@ How to use SSH (deploy keys) with create-pull-request action:
 
 ```yml
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
 ```
 
 ### Push pull request branches to a fork
@@ -225,76 +216,33 @@ Instead of pushing pull request branches to the repository you want to update, y
 This allows you to employ the [principle of least privilege](https://en.wikipedia.org/wiki/Principle_of_least_privilege) by using a dedicated user acting as a [machine account](https://docs.github.com/en/github/site-policy/github-terms-of-service#3-account-requirements).
 This user only has `read` access to the main repository.
 It will use their own fork to push code and create the pull request.
-
+Note that if you choose to use this method (not give the machine account `write` access to the repository) the following inputs cannot be used: `labels`, `assignees`, `reviewers`, `team-reviewers` and `milestone`.
-> [!NOTE]
-> If you choose to not give the machine account `write` access to the parent repository, the following inputs cannot be used: `labels`, `assignees`, `reviewers`, `team-reviewers` and `milestone`.
 
 1. Create a new GitHub user and login.
 2. Fork the repository that you will be creating pull requests in.
-3. Create a Classic [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) with `repo` and `workflow` scopes.
+3. Create a [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
 4. Logout and log back into your main user account.
 5. Add a secret to your repository containing the above PAT.
 6. As shown in the following example workflow, set the `push-to-fork` input to the full repository name of the fork.
 
 ```yaml
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       # Make changes to pull request here
 
-      - uses: peter-evans/create-pull-request@v7
+      - uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.MACHINE_USER_PAT }}
           push-to-fork: machine-user/fork-of-repository
 ```
 
-> [!TIP]
+Note: You can also combine `push-to-fork` with [creating pull requests in a remote repository](#creating-pull-requests-in-a-remote-repository).
-> You can also combine `push-to-fork` with [creating pull requests in a remote repository](#creating-pull-requests-in-a-remote-repository).
-
-#### Pushing to a fork with fine-grained permissions
-
-Using a fine-grained [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) or [GitHub App](#authenticating-with-github-app-generated-tokens) with `push-to-fork` can be achieved, but comes with some caveats.
-
-When using `push-to-fork`, the action needs permissions for two different repositories.
-It needs `contents: write` for the fork to push the branch, and `pull-requests: write` for the parent repository to create the pull request.
-
-There are two main scenarios:
-1. The parent and fork have different owners. In this case, it's not possible to create a token that is scoped to both repositories so different tokens must be used for each.
-2. The parent and fork both have the same owner (i.e. they exist in the same org). In this case, a single token can be scoped to both repositories, but the permissions granted cannot be different. So it would defeat the purpose of using `push-to-fork`, and you might as well just create the pull request directly on the parent repository.
-
-For the first scenario, the solution is to scope the token for the fork, and use the `branch-token` input to push the branch.
-The `token` input will then default to the repository's `GITHUB_TOKEN`, which will be used to create the pull request.
-
-> [!NOTE]
-> Solution limitations:
-> - Since `GITHUB_TOKEN` will be used to create the pull request, the workflow *must* be executing in the parent repository where the pull request should be created.
-> - `maintainer-can-modify` *must* be set to `false`, because the `GITHUB_TOKEN` will not have `write` access to the head branch in the fork.
-
-The following is an example of pushing to a fork using GitHub App tokens.
-```yaml
-      - uses: actions/create-github-app-token@v1
-        id: generate-token
-        with:
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-          owner: owner
-          repositories: fork-of-repo
-
-      - uses: actions/checkout@v4
-
-      # Make changes to pull request here
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          branch-token: ${{ steps.generate-token.outputs.token }}
-          push-to-fork: owner/fork-of-repo
-          maintainer-can-modify: false
-```
 
 ### Authenticating with GitHub App generated tokens
 
 A GitHub App can be created for the sole purpose of generating tokens for use with GitHub actions.
-GitHub App generated tokens can be configured with fine-grained permissions and are scoped to only repositories where the App is installed.
+These tokens can be used in place of `GITHUB_TOKEN` or a [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
+GitHub App generated tokens are more secure than using a PAT because GitHub App access permissions can be set with finer granularity and are scoped to only repositories where the App is installed.
 
 1. Create a minimal [GitHub App](https://docs.github.com/en/developers/apps/creating-a-github-app), setting the following fields:
 
@@ -303,115 +251,36 @@ GitHub App generated tokens can be configured with fine-grained permissions and
     - Uncheck `Active` under `Webhook`. You do not need to enter a `Webhook URL`.
     - Under `Repository permissions: Contents` select `Access: Read & write`.
     - Under `Repository permissions: Pull requests` select `Access: Read & write`.
-    - Under `Repository permissions: Workflows` select `Access: Read & write`.
-      - **NOTE**: Only needed if pull requests could contain changes to Actions workflows.
     - Under `Organization permissions: Members` select `Access: Read-only`.
       - **NOTE**: Only needed if you would like add teams as reviewers to PRs.
 
 2. Create a Private key from the App settings page and store it securely.
 
-3. Install the App on repositories that the action will require access to in order to create pull requests.
+3. Install the App on any repository where workflows will run requiring tokens.
 
 4. Set secrets on your repository containing the GitHub App ID, and the private key you created in step 2. e.g. `APP_ID`, `APP_PRIVATE_KEY`.
 
-5. The following example workflow shows how to use [actions/create-github-app-token](https://github.com/actions/create-github-app-token) to generate a token for use with this action.
+5. The following example workflow shows how to use [tibdex/github-app-token](https://github.com/tibdex/github-app-token) to generate a token for use with this action.
 
 ```yaml
     steps:
-      - uses: actions/create-github-app-token@v1
+      - uses: actions/checkout@v3
+
+      - uses: tibdex/github-app-token@v1
         id: generate-token
         with:
-          app-id: ${{ secrets.APP_ID }}
+          app_id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      - uses: actions/checkout@v4
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ steps.generate-token.outputs.token }}
 ```
 
-#### Creating pull requests in a remote repository using GitHub App generated tokens
+### GPG commit signature verification
-
-For this case a token must be generated from the GitHub App installation of the remote repository.
-
-In the following example, a pull request is being created in remote repo `owner/repo`.
-```yaml
-    steps:
-      - uses: actions/create-github-app-token@v1
-        id: generate-token
-        with:
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-          owner: owner
-          repositories: repo
-
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ steps.generate-token.outputs.token }} # necessary if the repo is private
-          repository: owner/repo
-
-      # Make changes to pull request here
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-```
-
-### Commit signing
-
-[Commit signature verification](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification) is a feature where GitHub will mark signed commits as "verified" to give confidence that changes are from a trusted source.
-Some organizations require commit signing, and enforce it with branch protection rules.
-
-The action supports two methods to sign commits, [commit signature verification for bots](#commit-signature-verification-for-bots), and [GPG commit signature verification](#gpg-commit-signature-verification).
-
-#### Commit signature verification for bots
-
-The action can sign commits as `github-actions[bot]` when using the repository's default `GITHUB_TOKEN`, or your own bot when using [GitHub App tokens](#authenticating-with-github-app-generated-tokens).
-
-> [!IMPORTANT]  
-> - When setting `sign-commits: true` the action will ignore the `committer` and `author` inputs.
-> - If you attempt to use a [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) the action will create the pull request, but commits will *not* be signed. Commit signing is only supported with bot generated tokens.
-> - The GitHub API has a 40MiB limit when creating git blobs. An error will be raised if there are files in the pull request larger than this. If you hit this limit, use [GPG commit signature verification](#gpg-commit-signature-verification) instead.
-
-In this example the `token` input is not supplied, so the action will use the repository's default `GITHUB_TOKEN`. This will sign commits as `github-actions[bot]`.
-```yaml
-    steps:
-      - uses: actions/checkout@v4
-
-      # Make changes to pull request here
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          sign-commits: true
-```
-
-In this example, the `token` input is generated using a GitHub App. This will sign commits as `<application-name>[bot]`.
-```yaml
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/create-github-app-token@v1
-        id: generate-token
-        with:
-          app-id: ${{ secrets.APP_ID }}
-          private-key: ${{ secrets.APP_PRIVATE_KEY }}
-
-      # Make changes to pull request here
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          sign-commits: true
-```
-
-#### GPG commit signature verification
 
 The action can use GPG to sign commits with a GPG key that you generate yourself.
 
@@ -431,24 +300,23 @@ The action can use GPG to sign commits with a GPG key that you generate yourself
 
 6. The following example workflow shows how to use [crazy-max/ghaction-import-gpg](https://github.com/crazy-max/ghaction-import-gpg) to import your GPG key and allow the action to sign commits.
 
-> [!IMPORTANT]
+   Note that the `committer` email address *MUST* match the email address used to create your GPG key.
-> The `committer` email address *MUST* match the email address used to create your GPG key.
 
 ```yaml
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
-      - uses: crazy-max/ghaction-import-gpg@v5
+      - uses: crazy-max/ghaction-import-gpg@v3
         with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          git_user_signingkey: true
+          git-user-signingkey: true
-          git_commit_gpgsign: true
+          git-commit-gpgsign: true
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.PAT }}
           committer: example <email@example.com>
@@ -473,12 +341,12 @@ jobs:
       - name: Install dependencies
         run: apk --no-cache add git
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
 ```
 
 **Ubuntu container example:**
@@ -496,10 +364,10 @@ jobs:
           add-apt-repository -y ppa:git-core/ppa
           apt-get install -y git
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
 ```

docs/examples.md

@@ -19,6 +19,7 @@
   - [autopep8](#autopep8)
 - [Misc workflow tips](#misc-workflow-tips)
   - [Filtering push events](#filtering-push-events)
+  - [Bypassing git hooks](#bypassing-git-hooks)
   - [Dynamic configuration using variables](#dynamic-configuration-using-variables)
   - [Using a markdown template](#using-a-markdown-template)
   - [Debugging GitHub Actions](#debugging-github-actions)
@@ -42,14 +43,14 @@ jobs:
   updateAuthors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Update AUTHORS
         run: |
           git log --format='%aN <%aE>%n%cN <%cE>' | sort -u > AUTHORS
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: update authors
           title: Update AUTHORS
@@ -73,7 +74,7 @@ jobs:
   productionPromotion:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: production
       - name: Reset promotion branch
@@ -81,7 +82,7 @@ jobs:
           git fetch origin main:main
           git reset --hard main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           branch: production-promotion
 ```
@@ -106,7 +107,7 @@ jobs:
   updateChangelog:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Update Changelog
@@ -116,7 +117,7 @@ jobs:
           ./git-chglog -o CHANGELOG.md
           rm git-chglog
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: update changelog
           title: Update Changelog
@@ -144,7 +145,7 @@ jobs:
   update-dep:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: '16.x'
@@ -153,7 +154,7 @@ jobs:
           npx -p npm-check-updates ncu -u
           npm install
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -180,7 +181,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
           node-version: 16.x
@@ -204,7 +205,7 @@ jobs:
   update-dep:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - uses: actions/setup-java@v2
         with:
           distribution: 'temurin'
@@ -214,7 +215,7 @@ jobs:
       - name: Perform dependency resolution and write new lockfiles
         run: ./gradlew dependencies --write-locks
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -242,14 +243,14 @@ jobs:
   update-dep:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Update dependencies
         run: |
           cargo install cargo-edit
           cargo update
           cargo upgrade --to-lockfile
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -277,7 +278,7 @@ jobs:
   updateSwagger:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Get Latest Swagger UI Release
         id: swagger-ui
         run: |
@@ -307,7 +308,7 @@ jobs:
           # Update current release
           echo ${{ steps.swagger-ui.outputs.release_tag }} > swagger-ui.version
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Update swagger-ui to ${{ steps.swagger-ui.outputs.release_tag }}
           title: Update SwaggerUI to ${{ steps.swagger-ui.outputs.release_tag }}
@@ -324,7 +325,7 @@ jobs:
 
 ### Keep a fork up-to-date with its upstream
 
-This example is designed to be run in a separate repository from the fork repository itself.
+This example is designed to be run in a seperate repository from the fork repository itself.
 The aim of this is to prevent committing anything to the fork's default branch would cause it to differ from the upstream.
 
 In the following example workflow, `owner/repo` is the upstream repository and `fork-owner/repo` is the fork. It assumes the default branch of the upstream repository is called `main`.
@@ -342,7 +343,7 @@ jobs:
   updateFork:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           repository: fork-owner/repo
       - name: Reset the default branch with upstream changes
@@ -351,7 +352,7 @@ jobs:
           git fetch upstream main:upstream-main
           git reset --hard upstream-main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.PAT }}
           branch: upstream-changes
@@ -370,7 +371,7 @@ jobs:
   format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Download website
         run: |
           wget \
@@ -384,7 +385,7 @@ jobs:
             --domains quotes.toscrape.com \
             http://quotes.toscrape.com/
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: update local website copy
           title: Automated Updates to Local Website Copy
@@ -466,7 +467,7 @@ jobs:
     if: startsWith(github.head_ref, 'autopep8-patches') == false && github.event.pull_request.head.repo.full_name == github.repository
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
       - name: autopep8
@@ -481,7 +482,7 @@ jobs:
           echo "branch-name=$branch-name" >> $GITHUB_OUTPUT
       - name: Create Pull Request
         if: steps.autopep8.outputs.exit-code == 2
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: autopep8 action fixes
           title: Fixes by autopep8 action
@@ -515,16 +516,28 @@ jobs:
     if: startsWith(github.ref, 'refs/heads/')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       ...
 
   someOtherJob:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       ...
 ```
 
+### Bypassing git hooks
+
+If you have git hooks that prevent the action from working correctly you can remove them before running the action.
+
+```yml
+      # Remove git hooks
+      - run: rm -rf .git/hooks
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+```
+
 ### Dynamic configuration using variables
 
 The following examples show how configuration for the action can be dynamically defined in a previous workflow step.
@@ -540,7 +553,7 @@ Note that the step where output variables are defined must have an id.
           echo "pr_title=$pr_title" >> $GITHUB_OUTPUT
           echo "pr_body=$pr_body" >> $GITHUB_OUTPUT
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           title: ${{ steps.vars.outputs.pr_title }}
           body: ${{ steps.vars.outputs.pr_body }}
@@ -566,7 +579,7 @@ The template is rendered using the [render-template](https://github.com/chuhlomi
             bar: that
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
+        uses: peter-evans/create-pull-request@v5
         with:
           body: ${{ steps.template.outputs.result }}
 ```

docs/updating.md

@@ -1,39 +1,3 @@
-## Updating from `v6` to `v7`
-
-### Behaviour changes
-
-- Action input `git-token` has been renamed `branch-token`, to be more clear about its purpose. The `branch-token` is the token that the action will use to create and update the branch.
-- The action now handles requests that have been rate-limited by GitHub. Requests hitting a primary rate limit will retry twice, for a total of three attempts. Requests hitting a secondary rate limit will not be retried.
-- The `pull-request-operation` output now returns `none` when no operation was executed.
-- Removed deprecated output environment variable `PULL_REQUEST_NUMBER`. Please use the `pull-request-number` action output instead.
-
-### What's new
-
-- The action can now sign commits as `github-actions[bot]` when using `GITHUB_TOKEN`, or your own bot when using [GitHub App tokens](concepts-guidelines.md#authenticating-with-github-app-generated-tokens). See [commit signing](concepts-guidelines.md#commit-signature-verification-for-bots) for details.
-- Action input `draft` now accepts a new value `always-true`. This will set the pull request to draft status when the pull request is updated, as well as on creation.
-- A new action input `maintainer-can-modify` indicates whether [maintainers can modify](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) the pull request. The default is `true`, which retains the existing behaviour of the action.
-- A new output `pull-request-commits-verified` returns `true` or `false`, indicating whether GitHub considers the signature of the branch's commits to be verified.
-
-## Updating from `v5` to `v6`
-
-### Behaviour changes
-
-- The default values for `author` and `committer` have changed. See "What's new" below for details. If you are overriding the default values you will not be affected by this change.
-- On completion, the action now removes the temporary git remote configuration it adds when using `push-to-fork`. This should not affect you unless you were using the temporary configuration for some other purpose after the action completes.
-
-### What's new
-
-- Updated runtime to Node.js 20
-  - The action now requires a minimum version of [v2.308.0](https://github.com/actions/runner/releases/tag/v2.308.0) for the Actions runner. Update self-hosted runners to v2.308.0 or later to ensure compatibility.
-- The default value for `author` has been changed to `${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com>`. The change adds the `${{ github.actor_id }}+` prefix to the email address to align with GitHub's standard format for the author email address.
-- The default value for `committer` has been changed to `github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>`. This is to align with the default GitHub Actions bot user account.
-- Adds input `git-token`, the [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) that the action will use for git operations. This input defaults to the value of `token`. Use this input if you would like the action to use a different token for git operations than the one used for the GitHub API.
-- `push-to-fork` now supports pushing to sibling repositories in the same network.
-- Previously, when using `push-to-fork`, the action did not remove temporary git remote configuration it adds during execution. This has been fixed and the configuration is now removed when the action completes.
-- If the pull request body is truncated due to exceeding the maximum length, the action will now suffix the body with the message "...*[Pull request body truncated]*" to indicate that the body has been truncated.
-- The action now uses `--unshallow` only when necessary, rather than as a default argument of `git fetch`. This should improve performance, particularly for large git repositories with extensive commit history.
-- The action can now be executed on one GitHub server and create pull requests on a *different* GitHub server. Server products include GitHub hosted (github.com), GitHub Enterprise Server (GHES), and GitHub Enterprise Cloud (GHEC). For example, the action can be executed on GitHub hosted and create pull requests on a GHES or GHEC instance.
-
 ## Updating from `v4` to `v5`
 
 ### Behaviour changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-pull-request",
-  "version": "7.0.0",
+  "version": "5.0.0",
   "private": true,
   "description": "Creates a pull request for changes to your repository in the actions workspace",
   "main": "lib/main.js",
@@ -29,35 +29,31 @@
   },
   "homepage": "https://github.com/peter-evans/create-pull-request",
   "dependencies": {
-    "@actions/core": "^1.11.1",
+    "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
-    "@octokit/core": "^6.1.2",
+    "@octokit/core": "^4.2.1",
-    "@octokit/plugin-paginate-rest": "^11.3.6",
+    "@octokit/plugin-paginate-rest": "^5.0.1",
-    "@octokit/plugin-rest-endpoint-methods": "^13.2.6",
+    "@octokit/plugin-rest-endpoint-methods": "^6.8.1",
-    "@octokit/plugin-throttling": "^9.3.2",
+    "https-proxy-agent": "^5.0.1",
-    "node-fetch-native": "^1.6.4",
+    "proxy-from-env": "^1.1.0",
-    "p-limit": "^6.1.0",
+    "uuid": "^9.0.0"
-    "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.2",
-    "@types/node": "^18.19.67",
+    "@types/node": "^18.16.18",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^5.59.11",
-    "@typescript-eslint/parser": "^7.18.0",
+    "@vercel/ncc": "^0.36.1",
-    "@vercel/ncc": "^0.38.3",
+    "eslint": "^8.42.0",
-    "eslint": "^8.57.1",
+    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-import-resolver-typescript": "^3.7.0",
+    "eslint-plugin-github": "^4.8.0",
-    "eslint-plugin-github": "^4.10.2",
+    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^27.2.1",
-    "eslint-plugin-jest": "^27.9.0",
+    "jest": "^29.5.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "jest-circus": "^29.4.2",
-    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.5.0",
-    "jest-circus": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
     "js-yaml": "^4.1.0",
-    "prettier": "^3.4.2",
+    "prettier": "^2.8.8",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "^29.1.0",
-    "typescript": "^5.7.2",
+    "typescript": "^4.9.5"
-    "undici": "^6.21.0"
   }
 }

src/create-or-update-branch.ts

@@ -1,14 +1,11 @@
 import * as core from '@actions/core'
-import {GitCommandManager, Commit} from './git-command-manager'
+import {GitCommandManager} from './git-command-manager'
 import {v4 as uuidv4} from 'uuid'
-import * as utils from './utils'
 
 const CHERRYPICK_EMPTY =
   'The previous cherry-pick is now empty, possibly due to conflict resolution.'
 const NOTHING_TO_COMMIT = 'nothing to commit, working tree clean'
 
-const FETCH_DEPTH_MARGIN = 10
-
 export enum WorkingBaseType {
   Branch = 'branch',
   Commit = 'commit'
@@ -34,13 +31,11 @@ export async function getWorkingBaseAndType(
 export async function tryFetch(
   git: GitCommandManager,
   remote: string,
-  branch: string,
+  branch: string
-  depth: number
 ): Promise<boolean> {
   try {
     await git.fetch([`${branch}:refs/remotes/${remote}/${branch}`], remote, [
-      '--force',
+      '--force'
-      `--depth=${depth}`
     ])
     return true
   } catch {
@@ -48,27 +43,6 @@ export async function tryFetch(
   }
 }
 
-export async function buildBranchCommits(
-  git: GitCommandManager,
-  base: string,
-  branch: string
-): Promise<Commit[]> {
-  const output = await git.exec(['log', '--format=%H', `${base}..${branch}`])
-  const shas = output.stdout
-    .split('\n')
-    .filter(x => x !== '')
-    .reverse()
-  const commits: Commit[] = []
-  for (const sha of shas) {
-    const commit = await git.getCommit(sha)
-    commits.push(commit)
-    for (const unparsedChange of commit.unparsedChanges) {
-      core.warning(`Skipping unexpected diff entry: ${unparsedChange}`)
-    }
-  }
-  return commits
-}
-
 // Return the number of commits that branch2 is ahead of branch1
 async function commitsAhead(
   git: GitCommandManager,
@@ -125,31 +99,6 @@ async function isEven(
   )
 }
 
-// Return true if the specified number of commits on branch1 and branch2 have a diff
-async function commitsHaveDiff(
-  git: GitCommandManager,
-  branch1: string,
-  branch2: string,
-  depth: number
-): Promise<boolean> {
-  // Some action use cases lead to the depth being a very large number and the diff fails.
-  // I've made this check optional for now because it was a fix for an edge case that is
-  // very rare, anyway.
-  try {
-    const diff1 = (
-      await git.exec(['diff', '--stat', `${branch1}..${branch1}~${depth}`])
-    ).stdout.trim()
-    const diff2 = (
-      await git.exec(['diff', '--stat', `${branch2}..${branch2}~${depth}`])
-    ).stdout.trim()
-    return diff1 !== diff2
-  } catch (error) {
-    core.info('Failed optional check of commits diff; Skipping.')
-    core.debug(utils.getErrorMessage(error))
-    return false
-  }
-}
-
 function splitLines(multilineString: string): string[] {
   return multilineString
     .split('\n')
@@ -161,9 +110,7 @@ interface CreateOrUpdateBranchResult {
   action: string
   base: string
   hasDiffWithBase: boolean
-  baseCommit: Commit
   headSha: string
-  branchCommits: Commit[]
 }
 
 export async function createOrUpdateBranch(
@@ -188,6 +135,14 @@ export async function createOrUpdateBranch(
   base = base ? base : workingBase
   const baseRemote = 'origin'
 
+  // Set the default return values
+  const result: CreateOrUpdateBranchResult = {
+    action: 'none',
+    base: base,
+    hasDiffWithBase: false,
+    headSha: ''
+  }
+
   // Save the working base changes to a temporary branch
   const tempBranch = uuidv4()
   await git.checkout(tempBranch, 'HEAD')
@@ -218,13 +173,22 @@ export async function createOrUpdateBranch(
   // Stash any uncommitted tracked and untracked changes
   const stashed = await git.stashPush(['--include-untracked'])
 
-  // Reset the working base
+  // Perform fetch and reset the working base
   // Commits made during the workflow will be removed
   if (workingBaseType == WorkingBaseType.Branch) {
     core.info(`Resetting working base branch '${workingBase}'`)
+    if (branchRemoteName == 'fork') {
+      // If pushing to a fork we must fetch with 'unshallow' to avoid the following error on git push
+      // ! [remote rejected] HEAD -> tests/push-branch-to-fork (shallow update not allowed)
+      await git.fetch([`${workingBase}:${workingBase}`], baseRemote, [
+        '--force'
+      ])
+    } else {
+      // If the remote is 'origin' we can git reset
       await git.checkout(workingBase)
       await git.exec(['reset', '--hard', `${baseRemote}/${workingBase}`])
     }
+  }
 
   // If the working base is not the base, rebase the temp branch commits
   // This will also be true if the working base type is a commit
@@ -232,13 +196,8 @@ export async function createOrUpdateBranch(
     core.info(
       `Rebasing commits made to ${workingBaseType} '${workingBase}' on to base branch '${base}'`
     )
-    const fetchArgs = ['--force']
-    if (branchRemoteName != 'fork') {
-      // If pushing to a fork we cannot shallow fetch otherwise the 'shallow update not allowed' error occurs
-      fetchArgs.push('--depth=1')
-    }
     // Checkout the actual base
-    await git.fetch([`${base}:${base}`], baseRemote, fetchArgs)
+    await git.fetch([`${base}:${base}`], baseRemote, ['--force'])
     await git.checkout(base)
     // Cherrypick commits from the temporary branch starting from the working base
     const commits = await git.revList(
@@ -257,29 +216,19 @@ export async function createOrUpdateBranch(
     // Reset the temp branch to the working index
     await git.checkout(tempBranch, 'HEAD')
     // Reset the base
-    await git.fetch([`${base}:${base}`], baseRemote, fetchArgs)
+    await git.fetch([`${base}:${base}`], baseRemote, ['--force'])
   }
 
-  // Determine the fetch depth for the pull request branch (best effort)
-  const tempBranchCommitsAhead = await commitsAhead(git, base, tempBranch)
-  const fetchDepth =
-    tempBranchCommitsAhead > 0
-      ? tempBranchCommitsAhead + FETCH_DEPTH_MARGIN
-      : FETCH_DEPTH_MARGIN
-
-  let action = 'none'
-  let hasDiffWithBase = false
-
   // Try to fetch the pull request branch
-  if (!(await tryFetch(git, branchRemoteName, branch, fetchDepth))) {
+  if (!(await tryFetch(git, branchRemoteName, branch))) {
     // The pull request branch does not exist
     core.info(`Pull request branch '${branch}' does not exist yet.`)
     // Create the pull request branch
     await git.checkout(branch, tempBranch)
     // Check if the pull request branch is ahead of the base
-    hasDiffWithBase = await isAhead(git, base, branch)
+    result.hasDiffWithBase = await isAhead(git, base, branch)
-    if (hasDiffWithBase) {
+    if (result.hasDiffWithBase) {
-      action = 'created'
+      result.action = 'created'
       core.info(`Created branch '${branch}'`)
     } else {
       core.info(
@@ -296,26 +245,21 @@ export async function createOrUpdateBranch(
 
     // Reset the branch if one of the following conditions is true.
     // - If the branch differs from the recreated temp branch.
-    // - If the number of commits ahead of the base branch differs between the branch and
-    //   temp branch. This catches a case where the base branch has been force pushed to
-    //   a new commit.
     // - If the recreated temp branch is not ahead of the base. This means there will be
     //   no pull request diff after the branch is reset. This will reset any undeleted
     //   branches after merging. In particular, it catches a case where the branch was
     //   squash merged but not deleted. We need to reset to make sure it doesn't appear
     //   to have a diff with the base due to different commits for the same changes.
-    // - If the diff of the commits ahead of the base branch differs between the branch and
+    // - If the number of commits ahead of the base branch differs between the branch and
-    //   temp branch. This catches a case where changes have been partially merged to the
+    //   temp branch. This catches a case where the base branch has been force pushed to
-    //   base. The overall diff is the same, but the branch needs to be rebased to show
+    //   a new commit.
-    //   the correct diff.
-    //
     // For changes on base this reset is equivalent to a rebase of the pull request branch.
+    const tempBranchCommitsAhead = await commitsAhead(git, base, tempBranch)
     const branchCommitsAhead = await commitsAhead(git, base, branch)
     if (
       (await git.hasDiff([`${branch}..${tempBranch}`])) ||
       branchCommitsAhead != tempBranchCommitsAhead ||
-      !(tempBranchCommitsAhead > 0) || // !isAhead
+      !(tempBranchCommitsAhead > 0) // !isAhead
-      (await commitsHaveDiff(git, branch, tempBranch, tempBranchCommitsAhead))
     ) {
       core.info(`Resetting '${branch}'`)
       // Alternatively, git switch -C branch tempBranch
@@ -326,29 +270,21 @@ export async function createOrUpdateBranch(
     // If the branch was reset or updated it will be ahead
     // It may be behind if a reset now results in no diff with the base
     if (!(await isEven(git, `${branchRemoteName}/${branch}`, branch))) {
-      action = 'updated'
+      result.action = 'updated'
       core.info(`Updated branch '${branch}'`)
     } else {
-      action = 'not-updated'
+      result.action = 'not-updated'
       core.info(
         `Branch '${branch}' is even with its remote and will not be updated`
       )
     }
 
     // Check if the pull request branch is ahead of the base
-    hasDiffWithBase = await isAhead(git, base, branch)
+    result.hasDiffWithBase = await isAhead(git, base, branch)
   }
 
-  // Get the base and head SHAs
+  // Get the pull request branch SHA
-  const baseSha = await git.revParse(base)
+  result.headSha = await git.revParse('HEAD')
-  const baseCommit = await git.getCommit(baseSha)
-  const headSha = await git.revParse(branch)
-
-  let branchCommits: Commit[] = []
-  if (hasDiffWithBase) {
-    // Build the branch commits
-    branchCommits = await buildBranchCommits(git, base, branch)
-  }
 
   // Delete the temporary branch
   await git.exec(['branch', '--delete', '--force', tempBranch])
@@ -361,12 +297,5 @@ export async function createOrUpdateBranch(
     await git.stashPop()
   }
 
-  return {
+  return result
-    action: action,
-    base: base,
-    hasDiffWithBase: hasDiffWithBase,
-    baseCommit: baseCommit,
-    headSha: headSha,
-    branchCommits: branchCommits
-  }
 }

src/create-pull-request.ts

@@ -6,12 +6,11 @@ import {
 } from './create-or-update-branch'
 import {GitHubHelper} from './github-helper'
 import {GitCommandManager} from './git-command-manager'
-import {GitConfigHelper} from './git-config-helper'
+import {GitAuthHelper} from './git-auth-helper'
 import * as utils from './utils'
 
 export interface Inputs {
   token: string
-  branchToken: string
   path: string
   addPaths: string[]
   commitMessage: string
@@ -23,7 +22,6 @@ export interface Inputs {
   branchSuffix: string
   base: string
   pushToFork: string
-  signCommits: boolean
   title: string
   body: string
   bodyPath: string
@@ -32,29 +30,49 @@ export interface Inputs {
   reviewers: string[]
   teamReviewers: string[]
   milestone: number
-  draft: {
+  draft: boolean
-    value: boolean
-    always: boolean
-  }
-  maintainerCanModify: boolean
 }
 
 export async function createPullRequest(inputs: Inputs): Promise<void> {
-  let gitConfigHelper, git
+  let gitAuthHelper
   try {
-    core.startGroup('Prepare git configuration')
+    if (!inputs.token) {
+      throw new Error(`Input 'token' not supplied. Unable to continue.`)
+    }
+    if (inputs.bodyPath) {
+      if (!utils.fileExistsSync(inputs.bodyPath)) {
+        throw new Error(`File '${inputs.bodyPath}' does not exist.`)
+      }
+      // Update the body input with the contents of the file
+      inputs.body = utils.readFile(inputs.bodyPath)
+    }
+    // 65536 characters is the maximum allowed for the pull request body.
+    if (inputs.body.length > 65536) {
+      core.warning(
+        `Pull request body is too long. Truncating to 65536 characters.`
+      )
+      inputs.body = inputs.body.substring(0, 65536)
+    }
+
+    // Get the repository path
     const repoPath = utils.getRepoPath(inputs.path)
-    git = await GitCommandManager.create(repoPath)
+    // Create a git command manager
-    gitConfigHelper = await GitConfigHelper.create(git)
+    const git = await GitCommandManager.create(repoPath)
+
+    // Save and unset the extraheader auth config if it exists
+    core.startGroup('Prepare git configuration')
+    gitAuthHelper = new GitAuthHelper(git)
+    await gitAuthHelper.addSafeDirectory()
+    await gitAuthHelper.savePersistedAuth()
     core.endGroup()
 
+    // Init the GitHub client
+    const githubHelper = new GitHubHelper(inputs.token)
+
     core.startGroup('Determining the base and head repositories')
-    const baseRemote = gitConfigHelper.getGitRemote()
+    // Determine the base repository from git config
-    // Init the GitHub clients
+    const remoteUrl = await git.tryGetRemoteUrl()
-    const apiUrl = await GitHubHelper.determineApiUrl(baseRemote.hostname)
+    const baseRemote = utils.getRemoteDetail(remoteUrl)
-    core.info(`Using API base URL: ${apiUrl}`)
-    const ghBranch = new GitHubHelper(apiUrl, inputs.branchToken)
-    const ghPull = new GitHubHelper(apiUrl, inputs.token)
     // Determine the head repository; the target for the pull request branch
     const branchRemoteName = inputs.pushToFork ? 'fork' : 'origin'
     const branchRepository = inputs.pushToFork
@@ -65,22 +83,12 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       core.info(
         `Checking if '${branchRepository}' is a fork of '${baseRemote.repository}'`
       )
-      const baseParentRepository = await ghBranch.getRepositoryParent(
+      const parentRepository = await githubHelper.getRepositoryParent(
-        baseRemote.repository
+        branchRepository
       )
-      const branchParentRepository =
+      if (parentRepository != baseRemote.repository) {
-        await ghBranch.getRepositoryParent(branchRepository)
-      if (branchParentRepository == null) {
         throw new Error(
-          `Repository '${branchRepository}' is not a fork. Unable to continue.`
+          `Repository '${branchRepository}' is not a fork of '${baseRemote.repository}'. Unable to continue.`
-        )
-      }
-      if (
-        branchParentRepository != baseRemote.repository &&
-        baseParentRepository != branchParentRepository
-      ) {
-        throw new Error(
-          `Repository '${branchRepository}' is not a fork of '${baseRemote.repository}', nor are they siblings. Unable to continue.`
         )
       }
       // Add a remote for the fork
@@ -99,7 +107,7 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
     // Configure auth
     if (baseRemote.protocol == 'HTTPS') {
       core.startGroup('Configuring credential for HTTPS authentication')
-      await gitConfigHelper.configureToken(inputs.branchToken)
+      await gitAuthHelper.configureToken(inputs.token)
       core.endGroup()
     }
 
@@ -182,11 +190,6 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
     )
     core.endGroup()
 
-    // Action outputs
-    const outputs = new Map<string, string>()
-    outputs.set('pull-request-branch', inputs.branch)
-    outputs.set('pull-request-operation', 'none')
-
     // Create or update the pull request branch
     core.startGroup('Create or update the pull request branch')
     const result = await createOrUpdateBranch(
@@ -198,9 +201,6 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       inputs.signoff,
       inputs.addPaths
     )
-    outputs.set('pull-request-head-sha', result.headSha)
-    // 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)) {
@@ -208,55 +208,39 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       core.startGroup(
         `Pushing pull request branch to '${branchRemoteName}/${inputs.branch}'`
       )
-      if (inputs.signCommits) {
-        // Create signed commits via the GitHub API
-        const stashed = await git.stashPush(['--include-untracked'])
-        await git.checkout(inputs.branch)
-        const pushSignedCommitsResult = await ghBranch.pushSignedCommits(
-          result.branchCommits,
-          result.baseCommit,
-          repoPath,
-          branchRepository,
-          inputs.branch
-        )
-        outputs.set('pull-request-head-sha', pushSignedCommitsResult.sha)
-        outputs.set(
-          'pull-request-commits-verified',
-          pushSignedCommitsResult.verified.toString()
-        )
-        await git.checkout('-')
-        if (stashed) {
-          await git.stashPop()
-        }
-      } else {
       await git.push([
         '--force-with-lease',
         branchRemoteName,
         `${inputs.branch}:refs/heads/${inputs.branch}`
       ])
-      }
       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')
-      const pull = await ghPull.createOrUpdatePullRequest(
+      const pull = await githubHelper.createOrUpdatePullRequest(
         inputs,
         baseRemote.repository,
         branchRepository
       )
-      outputs.set('pull-request-number', pull.number.toString())
+      core.endGroup()
-      outputs.set('pull-request-url', pull.html_url)
+
+      // Set outputs
+      core.startGroup('Setting outputs')
+      core.setOutput('pull-request-number', pull.number)
+      core.setOutput('pull-request-url', pull.html_url)
       if (pull.created) {
-        outputs.set('pull-request-operation', 'created')
+        core.setOutput('pull-request-operation', 'created')
       } else if (result.action == 'updated') {
-        outputs.set('pull-request-operation', 'updated')
+        core.setOutput('pull-request-operation', 'updated')
-        // The pull request was updated AND the branch was updated.
-        // Convert back to draft if 'draft: always-true' is set.
-        if (inputs.draft.always && pull.draft !== undefined && !pull.draft) {
-          await ghPull.convertToDraft(pull.node_id)
-        }
       }
+      core.setOutput('pull-request-head-sha', result.headSha)
+      // Deprecated
+      core.exportVariable('PULL_REQUEST_NUMBER', pull.number)
       core.endGroup()
     } else {
       // There is no longer a diff with the base
@@ -273,53 +257,21 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
             branchRemoteName,
             `refs/heads/${inputs.branch}`
           ])
-          outputs.set('pull-request-operation', 'closed')
-        }
-      }
-    }
-
-    core.startGroup('Setting outputs')
-    // If the head commit is signed, get its verification status if we don't already know it.
-    // This can happen if the branch wasn't updated (action = 'not-updated'), or GPG commit signing is in use.
-    if (
-      !outputs.has('pull-request-commits-verified') &&
-      result.branchCommits.length > 0 &&
-      result.branchCommits[result.branchCommits.length - 1].signed
-    ) {
-      // Using the local head commit SHA because in this case commits have not been pushed via the API.
-      core.info(`Checking verification status of head commit ${result.headSha}`)
-      try {
-        const headCommit = await ghBranch.getCommit(
-          result.headSha,
-          branchRepository
-        )
-        outputs.set(
-          'pull-request-commits-verified',
-          headCommit.verified.toString()
-        )
-      } catch (error) {
-        core.warning('Failed to check verification status of head commit.')
-        core.debug(utils.getErrorMessage(error))
-      }
-    }
-    if (!outputs.has('pull-request-commits-verified')) {
-      outputs.set('pull-request-commits-verified', 'false')
-    }
-
           // Set outputs
-    for (const [key, value] of outputs) {
+          core.startGroup('Setting outputs')
-      core.info(`${key} = ${value}`)
+          core.setOutput('pull-request-operation', 'closed')
-      core.setOutput(key, value)
-    }
           core.endGroup()
+        }
+      }
+    }
   } catch (error) {
     core.setFailed(utils.getErrorMessage(error))
   } finally {
+    // Remove auth and restore persisted auth config if it existed
     core.startGroup('Restore git configuration')
-    if (inputs.pushToFork) {
+    await gitAuthHelper.removeAuth()
-      await git.exec(['remote', 'rm', 'fork'])
+    await gitAuthHelper.restorePersistedAuth()
-    }
+    await gitAuthHelper.removeSafeDirectory()
-    await gitConfigHelper.close()
     core.endGroup()
   }
 }

src/git-auth-helper.ts

@@ -5,42 +5,22 @@ import * as path from 'path'
 import {URL} from 'url'
 import * as utils from './utils'
 
-interface GitRemote {
+export class GitAuthHelper {
-  hostname: string
-  protocol: string
-  repository: string
-}
-
-export class GitConfigHelper {
   private git: GitCommandManager
   private gitConfigPath = ''
   private workingDirectory: string
   private safeDirectoryConfigKey = 'safe.directory'
   private safeDirectoryAdded = false
-  private remoteUrl = ''
+  private extraheaderConfigKey: string
-  private extraheaderConfigKey = ''
   private extraheaderConfigPlaceholderValue = 'AUTHORIZATION: basic ***'
   private extraheaderConfigValueRegex = '^AUTHORIZATION:'
   private persistedExtraheaderConfigValue = ''
 
-  private constructor(git: GitCommandManager) {
+  constructor(git: GitCommandManager) {
     this.git = git
     this.workingDirectory = this.git.getWorkingDirectory()
-  }
+    const serverUrl = this.getServerUrl()
-
+    this.extraheaderConfigKey = `http.${serverUrl.origin}/.extraheader`
-  static async create(git: GitCommandManager): Promise<GitConfigHelper> {
-    const gitConfigHelper = new GitConfigHelper(git)
-    await gitConfigHelper.addSafeDirectory()
-    await gitConfigHelper.fetchRemoteDetail()
-    await gitConfigHelper.savePersistedAuth()
-    return gitConfigHelper
-  }
-
-  async close(): Promise<void> {
-    // Remove auth and restore persisted auth config if it existed
-    await this.removeAuth()
-    await this.restorePersistedAuth()
-    await this.removeSafeDirectory()
   }
 
   async addSafeDirectory(): Promise<void> {
@@ -70,57 +50,7 @@ export class GitConfigHelper {
     }
   }
 
-  async fetchRemoteDetail(): Promise<void> {
-    this.remoteUrl = await this.git.tryGetRemoteUrl()
-  }
-
-  getGitRemote(): GitRemote {
-    return GitConfigHelper.parseGitRemote(this.remoteUrl)
-  }
-
-  static parseGitRemote(remoteUrl: string): GitRemote {
-    const httpsUrlPattern = new RegExp(
-      '^(https?)://(?:.+@)?(.+?)/(.+/.+?)(\\.git)?$',
-      'i'
-    )
-    const httpsMatch = remoteUrl.match(httpsUrlPattern)
-    if (httpsMatch) {
-      return {
-        hostname: httpsMatch[2],
-        protocol: 'HTTPS',
-        repository: httpsMatch[3]
-      }
-    }
-
-    const sshUrlPattern = new RegExp('^git@(.+?):(.+/.+)\\.git$', 'i')
-    const sshMatch = remoteUrl.match(sshUrlPattern)
-    if (sshMatch) {
-      return {
-        hostname: sshMatch[1],
-        protocol: 'SSH',
-        repository: sshMatch[2]
-      }
-    }
-
-    // Unauthenticated git protocol for integration tests only
-    const gitUrlPattern = new RegExp('^git://(.+?)/(.+/.+)\\.git$', 'i')
-    const gitMatch = remoteUrl.match(gitUrlPattern)
-    if (gitMatch) {
-      return {
-        hostname: gitMatch[1],
-        protocol: 'GIT',
-        repository: gitMatch[2]
-      }
-    }
-
-    throw new Error(
-      `The format of '${remoteUrl}' is not a valid GitHub repository URL`
-    )
-  }
-
   async savePersistedAuth(): Promise<void> {
-    const serverUrl = new URL(`https://${this.getGitRemote().hostname}`)
-    this.extraheaderConfigKey = `http.${serverUrl.origin}/.extraheader`
     // Save and unset persisted extraheader credential in git config if it exists
     this.persistedExtraheaderConfigValue = await this.getAndUnset()
   }
@@ -214,4 +144,8 @@ export class GitConfigHelper {
     content = content.replace(find, replace)
     await fs.promises.writeFile(this.gitConfigPath, content)
   }
+
+  private getServerUrl(): URL {
+    return new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com')
+  }
 }

src/git-command-manager.ts

@@ -5,22 +5,6 @@ import * as path from 'path'
 
 const tagsRefSpec = '+refs/tags/*:refs/tags/*'
 
-export type Commit = {
-  sha: string
-  tree: string
-  parents: string[]
-  signed: boolean
-  subject: string
-  body: string
-  changes: {
-    mode: string
-    dstSha: string
-    status: 'A' | 'M' | 'D'
-    path: string
-  }[]
-  unparsedChanges: string[]
-}
-
 export class GitCommandManager {
   private gitPath: string
   private workingDirectory: string
@@ -121,8 +105,7 @@ export class GitCommandManager {
   async fetch(
     refSpec: string[],
     remoteName?: string,
-    options?: string[],
+    options?: string[]
-    unshallow = false
   ): Promise<void> {
     const args = ['-c', 'protocol.version=2', 'fetch']
     if (!refSpec.some(x => x === tagsRefSpec)) {
@@ -130,9 +113,7 @@ export class GitCommandManager {
     }
 
     args.push('--progress', '--no-recurse-submodules')
-
     if (
-      unshallow &&
       utils.fileExistsSync(path.join(this.workingDirectory, '.git', 'shallow'))
     ) {
       args.push('--unshallow')
@@ -154,48 +135,6 @@ export class GitCommandManager {
     await this.exec(args)
   }
 
-  async getCommit(ref: string): Promise<Commit> {
-    const endOfBody = '###EOB###'
-    const output = await this.exec([
-      'show',
-      '--raw',
-      '--cc',
-      '--no-renames',
-      '--no-abbrev',
-      `--format=%H%n%T%n%P%n%G?%n%s%n%b%n${endOfBody}`,
-      ref
-    ])
-    const lines = output.stdout.split('\n')
-    const endOfBodyIndex = lines.lastIndexOf(endOfBody)
-    const detailLines = lines.slice(0, endOfBodyIndex)
-
-    const unparsedChanges: string[] = []
-    return <Commit>{
-      sha: detailLines[0],
-      tree: detailLines[1],
-      parents: detailLines[2].split(' '),
-      signed: detailLines[3] !== 'N',
-      subject: detailLines[4],
-      body: detailLines.slice(5, endOfBodyIndex).join('\n'),
-      changes: lines.slice(endOfBodyIndex + 2, -1).map(line => {
-        const change = line.match(
-          /^:(\d{6}) (\d{6}) \w{40} (\w{40}) ([AMD])\s+(.*)$/
-        )
-        if (change) {
-          return {
-            mode: change[4] === 'D' ? change[1] : change[2],
-            dstSha: change[3],
-            status: change[4],
-            path: change[5]
-          }
-        } else {
-          unparsedChanges.push(line)
-        }
-      }),
-      unparsedChanges: unparsedChanges
-    }
-  }
-
   async getConfigValue(configKey: string, configValue = '.'): Promise<string> {
     const output = await this.exec([
       'config',

src/github-helper.ts

@@ -1,16 +1,10 @@
 import * as core from '@actions/core'
 import {Inputs} from './create-pull-request'
-import {Commit} from './git-command-manager'
+import {Octokit, OctokitOptions} from './octokit-client'
-import {Octokit, OctokitOptions, throttleOptions} from './octokit-client'
-import pLimit from 'p-limit'
 import * as utils from './utils'
 
-const ERROR_PR_ALREADY_EXISTS = 'A pull request already exists for'
 const ERROR_PR_REVIEW_TOKEN_SCOPE =
   'Validation Failed: "Could not resolve to a node with the global id of'
-const ERROR_PR_FORK_COLLAB = `Fork collab can't be granted by someone without permission`
-
-const blobCreationLimit = pLimit(8)
 
 interface Repository {
   owner: string
@@ -20,75 +14,21 @@ interface Repository {
 interface Pull {
   number: number
   html_url: string
-  node_id: string
-  draft?: boolean
   created: boolean
 }
 
-interface CommitResponse {
-  sha: string
-  tree: string
-  verified: boolean
-}
-
-type TreeObject = {
-  path: string
-  mode: '100644' | '100755' | '040000' | '160000' | '120000'
-  sha: string | null
-  type: 'blob' | 'commit'
-}
-
 export class GitHubHelper {
   private octokit: InstanceType<typeof Octokit>
 
-  constructor(apiUrl: string, token: string) {
+  constructor(token: string) {
     const options: OctokitOptions = {}
     if (token) {
       options.auth = `${token}`
     }
-    options.baseUrl = apiUrl
+    options.baseUrl = process.env['GITHUB_API_URL'] || 'https://api.github.com'
-    options.throttle = throttleOptions
     this.octokit = new Octokit(options)
   }
 
-  static async determineApiUrl(hostname: string): Promise<string> {
-    if (hostname === 'github.com') {
-      return 'https://api.github.com'
-    }
-
-    const baseUrl = `https://${hostname}`
-    const possiblePaths = [
-      '/api/v4/version',
-      '/api/forgejo/v1/version',
-      '/api/v1/version'
-    ]
-
-    for (const path of possiblePaths) {
-      try {
-        const url = `${baseUrl}${path}`
-        const response = await fetch(url, {method: 'GET', redirect: 'manual'}) // GitLab redirects
-        // invalid API paths
-        // to login prompt
-        // which returns 200
-
-        const contentType = response.headers.get('Content-Type') || ''
-        if (
-          (response.ok || [401, 403].includes(response.status)) && // We might get 401, 403
-          // as we're unauthorised
-          contentType.includes('application/json')
-        ) {
-          return path.includes('/version') ? url.replace('/version', '') : url
-        }
-      } catch (error) {
-        // Ignore errors and try the next path
-      }
-    }
-
-    throw new Error(
-      `Unable to determine API base URL for hostname: ${hostname}`
-    )
-  }
-
   private parseRepository(repository: string): Repository {
     const [owner, repo] = repository.split('/')
     return {
@@ -115,8 +55,7 @@ export class GitHubHelper {
         head_repo: headRepository,
         base: inputs.base,
         body: inputs.body,
-        draft: inputs.draft.value,
+        draft: inputs.draft
-        maintainer_can_modify: inputs.maintainerCanModify
       })
       core.info(
         `Created pull request #${pull.number} (${headBranch} => ${inputs.base})`
@@ -124,22 +63,13 @@ export class GitHubHelper {
       return {
         number: pull.number,
         html_url: pull.html_url,
-        node_id: pull.node_id,
-        draft: pull.draft,
         created: true
       }
     } catch (e) {
-      const errorMessage = utils.getErrorMessage(e)
+      if (
-      if (errorMessage.includes(ERROR_PR_ALREADY_EXISTS)) {
+        utils.getErrorMessage(e).includes(`A pull request already exists for`)
+      ) {
         core.info(`A pull request already exists for ${headBranch}`)
-      } else if (errorMessage.includes(ERROR_PR_FORK_COLLAB)) {
-        core.warning(
-          'An attempt was made to create a pull request using a token that does not have write access to the head branch.'
-        )
-        core.warning(
-          `For this case, set input 'maintainer-can-modify' to 'false' to allow pull request creation.`
-        )
-        throw e
       } else {
         throw e
       }
@@ -166,18 +96,18 @@ export class GitHubHelper {
     return {
       number: pull.number,
       html_url: pull.html_url,
-      node_id: pull.node_id,
-      draft: pull.draft,
       created: false
     }
   }
 
-  async getRepositoryParent(headRepository: string): Promise<string | null> {
+  async getRepositoryParent(headRepository: string): Promise<string> {
     const {data: headRepo} = await this.octokit.rest.repos.get({
       ...this.parseRepository(headRepository)
     })
     if (!headRepo.parent) {
-      return null
+      throw new Error(
+        `Repository '${headRepository}' is not a fork. Unable to continue.`
+      )
     }
     return headRepo.parent.full_name
   }
@@ -252,188 +182,4 @@ export class GitHubHelper {
 
     return pull
   }
-
-  async pushSignedCommits(
-    branchCommits: Commit[],
-    baseCommit: Commit,
-    repoPath: string,
-    branchRepository: string,
-    branch: string
-  ): Promise<CommitResponse> {
-    let headCommit: CommitResponse = {
-      sha: baseCommit.sha,
-      tree: baseCommit.tree,
-      verified: false
-    }
-    for (const commit of branchCommits) {
-      headCommit = await this.createCommit(
-        commit,
-        headCommit,
-        repoPath,
-        branchRepository
-      )
-    }
-    await this.createOrUpdateRef(branchRepository, branch, headCommit.sha)
-    return headCommit
-  }
-
-  private async createCommit(
-    commit: Commit,
-    parentCommit: CommitResponse,
-    repoPath: string,
-    branchRepository: string
-  ): Promise<CommitResponse> {
-    const repository = this.parseRepository(branchRepository)
-    // In the case of an empty commit, the tree references the parent's tree
-    let treeSha = parentCommit.tree
-    if (commit.changes.length > 0) {
-      core.info(`Creating tree objects for local commit ${commit.sha}`)
-      const treeObjects = await Promise.all(
-        commit.changes.map(async ({path, mode, status, dstSha}) => {
-          if (mode === '160000') {
-            // submodule
-            core.info(`Creating tree object for submodule commit at '${path}'`)
-            return <TreeObject>{
-              path,
-              mode,
-              sha: dstSha,
-              type: 'commit'
-            }
-          } else {
-            let sha: string | null = null
-            if (status === 'A' || status === 'M') {
-              try {
-                const {data: blob} = await blobCreationLimit(() =>
-                  this.octokit.rest.git.createBlob({
-                    ...repository,
-                    content: utils.readFileBase64([repoPath, path]),
-                    encoding: 'base64'
-                  })
-                )
-                sha = blob.sha
-              } catch (error) {
-                core.error(
-                  `Error creating blob for file '${path}': ${utils.getErrorMessage(error)}`
-                )
-                throw error
-              }
-            }
-            core.info(
-              `Creating tree object for blob at '${path}' with status '${status}'`
-            )
-            return <TreeObject>{
-              path,
-              mode,
-              sha,
-              type: 'blob'
-            }
-          }
-        })
-      )
-
-      const chunkSize = 100
-      const chunkedTreeObjects: TreeObject[][] = Array.from(
-        {length: Math.ceil(treeObjects.length / chunkSize)},
-        (_, i) => treeObjects.slice(i * chunkSize, i * chunkSize + chunkSize)
-      )
-
-      core.info(`Creating tree for local commit ${commit.sha}`)
-      for (let i = 0; i < chunkedTreeObjects.length; i++) {
-        const {data: tree} = await this.octokit.rest.git.createTree({
-          ...repository,
-          base_tree: treeSha,
-          tree: chunkedTreeObjects[i]
-        })
-        treeSha = tree.sha
-        if (chunkedTreeObjects.length > 1) {
-          core.info(
-            `Created tree ${treeSha} of multipart tree (${i + 1} of ${chunkedTreeObjects.length})`
-          )
-        }
-      }
-      core.info(`Created tree ${treeSha} for local commit ${commit.sha}`)
-    }
-
-    const {data: remoteCommit} = await this.octokit.rest.git.createCommit({
-      ...repository,
-      parents: [parentCommit.sha],
-      tree: treeSha,
-      message: `${commit.subject}\n\n${commit.body}`
-    })
-    core.info(
-      `Created commit ${remoteCommit.sha} for local commit ${commit.sha}`
-    )
-    core.info(
-      `Commit verified: ${remoteCommit.verification.verified}; reason: ${remoteCommit.verification.reason}`
-    )
-    return {
-      sha: remoteCommit.sha,
-      tree: remoteCommit.tree.sha,
-      verified: remoteCommit.verification.verified
-    }
-  }
-
-  async getCommit(
-    sha: string,
-    branchRepository: string
-  ): Promise<CommitResponse> {
-    const repository = this.parseRepository(branchRepository)
-    const {data: remoteCommit} = await this.octokit.rest.git.getCommit({
-      ...repository,
-      commit_sha: sha
-    })
-    return {
-      sha: remoteCommit.sha,
-      tree: remoteCommit.tree.sha,
-      verified: remoteCommit.verification.verified
-    }
-  }
-
-  private async createOrUpdateRef(
-    branchRepository: string,
-    branch: string,
-    newHead: string
-  ) {
-    const repository = this.parseRepository(branchRepository)
-    const branchExists = await this.octokit.rest.repos
-      .getBranch({
-        ...repository,
-        branch: branch
-      })
-      .then(
-        () => true,
-        () => false
-      )
-
-    if (branchExists) {
-      core.info(`Branch ${branch} exists; Updating ref`)
-      await this.octokit.rest.git.updateRef({
-        ...repository,
-        sha: newHead,
-        ref: `heads/${branch}`,
-        force: true
-      })
-    } else {
-      core.info(`Branch ${branch} does not exist; Creating ref`)
-      await this.octokit.rest.git.createRef({
-        ...repository,
-        sha: newHead,
-        ref: `refs/heads/${branch}`
-      })
-    }
-  }
-
-  async convertToDraft(id: string): Promise<void> {
-    core.info(`Converting pull request to draft`)
-    await this.octokit.graphql({
-      query: `mutation($pullRequestId: ID!) {
-        convertPullRequestToDraft(input: {pullRequestId: $pullRequestId}) {
-          pullRequest {
-            isDraft
-          }
-        }
-      }`,
-      pullRequestId: id
-    })
-  }
 }

src/main.ts

@@ -3,19 +3,10 @@ import {Inputs, createPullRequest} from './create-pull-request'
 import {inspect} from 'util'
 import * as utils from './utils'
 
-function getDraftInput(): {value: boolean; always: boolean} {
-  if (core.getInput('draft') === 'always-true') {
-    return {value: true, always: true}
-  } else {
-    return {value: core.getBooleanInput('draft'), always: false}
-  }
-}
-
 async function run(): Promise<void> {
   try {
     const inputs: Inputs = {
       token: core.getInput('token'),
-      branchToken: core.getInput('branch-token'),
       path: core.getInput('path'),
       addPaths: utils.getInputAsArray('add-paths'),
       commitMessage: core.getInput('commit-message'),
@@ -27,7 +18,6 @@ async function run(): Promise<void> {
       branchSuffix: core.getInput('branch-suffix'),
       base: core.getInput('base'),
       pushToFork: core.getInput('push-to-fork'),
-      signCommits: core.getBooleanInput('sign-commits'),
       title: core.getInput('title'),
       body: core.getInput('body'),
       bodyPath: core.getInput('body-path'),
@@ -36,32 +26,10 @@ async function run(): Promise<void> {
       reviewers: utils.getInputAsArray('reviewers'),
       teamReviewers: utils.getInputAsArray('team-reviewers'),
       milestone: Number(core.getInput('milestone')),
-      draft: getDraftInput(),
+      draft: core.getBooleanInput('draft')
-      maintainerCanModify: core.getBooleanInput('maintainer-can-modify')
     }
     core.debug(`Inputs: ${inspect(inputs)}`)
 
-    if (!inputs.token) {
-      throw new Error(`Input 'token' not supplied. Unable to continue.`)
-    }
-    if (!inputs.branchToken) {
-      inputs.branchToken = inputs.token
-    }
-    if (inputs.bodyPath) {
-      if (!utils.fileExistsSync(inputs.bodyPath)) {
-        throw new Error(`File '${inputs.bodyPath}' does not exist.`)
-      }
-      // Update the body input with the contents of the file
-      inputs.body = utils.readFile(inputs.bodyPath)
-    }
-    // 65536 characters is the maximum allowed for the pull request body.
-    if (inputs.body.length > 65536) {
-      core.warning(
-        `Pull request body is too long. Truncating to 65536 characters.`
-      )
-      inputs.body = inputs.body.substring(0, 65536)
-    }
-
     await createPullRequest(inputs)
   } catch (error) {
     core.setFailed(utils.getErrorMessage(error))

src/octokit-client.ts

@@ -1,40 +1,23 @@
-import * as core from '@actions/core'
+import {Octokit as Core} from '@octokit/core'
-import {Octokit as OctokitCore} from '@octokit/core'
 import {paginateRest} from '@octokit/plugin-paginate-rest'
 import {restEndpointMethods} from '@octokit/plugin-rest-endpoint-methods'
-import {throttling} from '@octokit/plugin-throttling'
+import {HttpsProxyAgent} from 'https-proxy-agent'
-import {fetch} from 'node-fetch-native/proxy'
+import {getProxyForUrl} from 'proxy-from-env'
 export {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods'
-// eslint-disable-next-line import/no-unresolved
 export {OctokitOptions} from '@octokit/core/dist-types/types'
 
-export const Octokit = OctokitCore.plugin(
+export const Octokit = Core.plugin(
   paginateRest,
   restEndpointMethods,
-  throttling,
   autoProxyAgent
 )
 
-export const throttleOptions = {
-  onRateLimit: (retryAfter, options, _, retryCount) => {
-    core.debug(`Hit rate limit for request ${options.method} ${options.url}`)
-    // Retries twice for a total of three attempts
-    if (retryCount < 2) {
-      core.debug(`Retrying after ${retryAfter} seconds!`)
-      return true
-    }
-  },
-  onSecondaryRateLimit: (retryAfter, options) => {
-    core.warning(
-      `Hit secondary rate limit for request ${options.method} ${options.url}`
-    )
-    core.warning(`Requests may be retried after ${retryAfter} seconds.`)
-  }
-}
-
 // Octokit plugin to support the standard environment variables http_proxy, https_proxy and no_proxy
-function autoProxyAgent(octokit: OctokitCore) {
+function autoProxyAgent(octokit: Core) {
   octokit.hook.before('request', options => {
-    options.request.fetch = fetch
+    const proxy = getProxyForUrl(options.baseUrl)
+    if (proxy) {
+      options.request.agent = new HttpsProxyAgent(proxy)
+    }
   })
 }

src/utils.ts

@@ -41,6 +41,53 @@ export function getRepoPath(relativePath?: string): string {
   return repoPath
 }
 
+interface RemoteDetail {
+  hostname: string
+  protocol: string
+  repository: string
+}
+
+export function getRemoteDetail(remoteUrl: string): RemoteDetail {
+  // Parse the protocol and github repository from a URL
+  // e.g. HTTPS, peter-evans/create-pull-request
+  const githubUrl = process.env['GITHUB_SERVER_URL'] || 'https://github.com'
+
+  const githubServerMatch = githubUrl.match(/^https?:\/\/(.+)$/i)
+  if (!githubServerMatch) {
+    throw new Error('Could not parse GitHub Server name')
+  }
+
+  const hostname = githubServerMatch[1]
+
+  const httpsUrlPattern = new RegExp(
+    '^https?://.*@?' + hostname + '/(.+/.+?)(\\.git)?$',
+    'i'
+  )
+  const sshUrlPattern = new RegExp('^git@' + hostname + ':(.+/.+)\\.git$', 'i')
+
+  const httpsMatch = remoteUrl.match(httpsUrlPattern)
+  if (httpsMatch) {
+    return {
+      hostname,
+      protocol: 'HTTPS',
+      repository: httpsMatch[1]
+    }
+  }
+
+  const sshMatch = remoteUrl.match(sshUrlPattern)
+  if (sshMatch) {
+    return {
+      hostname,
+      protocol: 'SSH',
+      repository: sshMatch[1]
+    }
+  }
+
+  throw new Error(
+    `The format of '${remoteUrl}' is not a valid GitHub repository URL`
+  )
+}
+
 export function getRemoteUrl(
   protocol: string,
   hostname: string,
@@ -126,16 +173,6 @@ export function readFile(path: string): string {
   return fs.readFileSync(path, 'utf-8')
 }
 
-export function readFileBase64(pathParts: string[]): string {
-  const resolvedPath = path.resolve(...pathParts)
-  if (fs.lstatSync(resolvedPath).isSymbolicLink()) {
-    return fs
-      .readlinkSync(resolvedPath, {encoding: 'buffer'})
-      .toString('base64')
-  }
-  return fs.readFileSync(resolvedPath).toString('base64')
-}
-
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 function hasErrorCode(error: any): error is {code: string} {
   return typeof (error && error.code) === 'string'