fix(ci): Docker is missing in small/medium act runners

Bumps [prettier](https://github.com/prettier/prettier) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/3.4.1...3.4.2)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/ci.yml

@@ -24,6 +24,8 @@ jobs:
         with:
           node-version: 20.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
@@ -109,6 +111,9 @@ 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'
@@ -121,7 +126,7 @@ jobs:
           name: dist
           path: dist
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.ACTIONS_BOT_TOKEN }}
           commit-message: 'build: update distribution'

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

@@ -11,8 +11,8 @@ on:
         type: choice
         description: The major version tag to update
         options:
-          - v5
           - v6
+          - v7
 
 jobs:
   tag:

README.md

@@ -15,13 +15,13 @@ 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 a pull request to merge the new branch into the base—the branch checked out in the workflow.
+3. Create or update a pull request to merge the 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 v6](docs/updating.md)
+- [Updating to v7](docs/updating.md)
 - [Common issues](docs/common-issues.md)
 
 ## Usage
@@ -32,10 +32,10 @@ Create Pull Request action will:
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
 ```
 
-You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v6.x.x`
+You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v7.x.x`
 
 ### Workflow permissions
 
@@ -48,12 +48,10 @@ 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` | `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` |
+| `token` | The token that the action will use to create and update the pull request. See [token](#token). | `GITHUB_TOKEN` |
-| `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. | Defaults to the value of `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` |
@@ -65,6 +63,7 @@ All inputs are **optional**. If not set, sensible defaults will be used.
 | `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`. | |
@@ -73,8 +72,35 @@ 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). It is not possible to change draft status after creation except through the web interface. | `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). Valid values are `true` (only on create), `always-true` (on create and update), and `false`.  | `false` |
-| `sign-commit` | Sign the commit as bot [refer: [Signature verification for bots](https://docs.github.com/en/authentication/managing-commit-signature-verification/about-commit-signature-verification#signature-verification-for-bots)]. This can be useful if your repo or org has enforced commit-signing. | `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
 
@@ -105,7 +131,7 @@ If you want branches to be deleted immediately on merge then you should use GitH
 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@v6
+        uses: peter-evans/create-pull-request@v7
         env:
           https_proxy: http://<proxy_address>:<port>
 ```
@@ -116,9 +142,10 @@ 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` or `closed`.
+- `pull-request-operation` - The pull request operation performed by the action, `created`, `updated`, `closed` or `none`.
 - `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.
@@ -126,7 +153,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@v6
+        uses: peter-evans/create-pull-request@v7
       - name: Check outputs
         if: ${{ steps.cpr.outputs.pull-request-number }}
         run: |
@@ -189,7 +216,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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           add-paths: |
             *.java
@@ -216,25 +243,7 @@ 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@v6
+        uses: peter-evans/create-pull-request@v7
-```
-
-### 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@v6
-
-      - 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
@@ -261,7 +270,7 @@ jobs:
 
       - name: Create Pull Request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           commit-message: Update report

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

@@ -2,7 +2,6 @@ import {
   createOrUpdateBranch,
   tryFetch,
   getWorkingBaseAndType,
-  buildBranchFileChanges,
   buildBranchCommits
 } from '../lib/create-or-update-branch'
 import * as fs from 'fs'
@@ -240,6 +239,9 @@ describe('create-or-update-branch tests', () => {
   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'])
 
@@ -247,11 +249,16 @@ describe('create-or-update-branch tests', () => {
 
     expect(branchCommits.length).toEqual(1)
     expect(branchCommits[0].subject).toEqual('Test changes')
-    expect(branchCommits[0].changes.length).toEqual(2)
+    expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes).toEqual([
+    expect(branchCommits[0].changes[0].mode).toEqual('100755')
-      {mode: '100644', path: TRACKED_FILE, status: 'M'},
+    expect(branchCommits[0].changes[0].path).toEqual(UNTRACKED_EXE_FILE)
-      {mode: '100644', path: UNTRACKED_FILE, status: 'A'}
+    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 () => {
@@ -269,11 +276,15 @@ describe('create-or-update-branch tests', () => {
     expect(branchCommits.length).toEqual(1)
     expect(branchCommits[0].subject).toEqual('Test changes')
     expect(branchCommits[0].changes.length).toEqual(3)
-    expect(branchCommits[0].changes).toEqual([
+    expect(branchCommits[0].changes[0].mode).toEqual('100644')
-      {mode: '100644', path: TRACKED_FILE, status: 'D'},
+    expect(branchCommits[0].changes[0].path).toEqual(TRACKED_FILE)
-      {mode: '100644', path: UNTRACKED_FILE, status: 'A'},
+    expect(branchCommits[0].changes[0].status).toEqual('D')
-      {mode: '100644', path: TRACKED_FILE_NEW_PATH, status: 'A'}
+    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 () => {
@@ -291,87 +302,16 @@ describe('create-or-update-branch tests', () => {
       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).toEqual([
+
-        {mode: '100644', path: TRACKED_FILE, status: 'M'},
+      expect(branchCommits[i].changes[0].mode).toEqual('100644')
-        {mode: '100644', path: UNTRACKED_FILE, status: untrackedFileStatus}
+      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 buildBranchFileChanges with no diff', async () => {
-    await git.checkout(BRANCH, BASE)
-    const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH)
-    expect(branchFileChanges.additions.length).toEqual(0)
-    expect(branchFileChanges.deletions.length).toEqual(0)
-  })
-
-  it('tests buildBranchFileChanges with addition and modification', async () => {
-    await git.checkout(BRANCH, BASE)
-    const changes = await createChanges()
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', 'Test changes'])
-
-    const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH)
-
-    expect(branchFileChanges.additions).toEqual([
-      {
-        path: TRACKED_FILE,
-        contents: Buffer.from(changes.tracked, 'binary').toString('base64')
-      },
-      {
-        path: UNTRACKED_FILE,
-        contents: Buffer.from(changes.untracked, 'binary').toString('base64')
-      }
-    ])
-    expect(branchFileChanges.deletions.length).toEqual(0)
-  })
-
-  it('tests buildBranchFileChanges with addition and deletion', async () => {
-    await git.checkout(BRANCH, BASE)
-    const changes = 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 branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH)
-
-    expect(branchFileChanges.additions).toEqual([
-      {
-        path: UNTRACKED_FILE,
-        contents: Buffer.from(changes.untracked, 'binary').toString('base64')
-      },
-      {
-        path: TRACKED_FILE_NEW_PATH,
-        contents: Buffer.from(changes.tracked, 'binary').toString('base64')
-      }
-    ])
-    expect(branchFileChanges.deletions).toEqual([{path: TRACKED_FILE}])
-  })
-
-  it('tests buildBranchFileChanges with binary files', async () => {
-    await git.checkout(BRANCH, BASE)
-    const filename = 'c/untracked-binary-file'
-    const filepath = path.join(REPO_PATH, filename)
-    const binaryData = Buffer.from([0x00, 0xff, 0x10, 0x20])
-    await fs.promises.mkdir(path.dirname(filepath), {recursive: true})
-    await fs.promises.writeFile(filepath, binaryData)
-    await git.exec(['add', '-A'])
-    await git.commit(['-m', 'Test changes'])
-
-    const branchFileChanges = await buildBranchFileChanges(git, BASE, BRANCH)
-
-    expect(branchFileChanges.additions).toEqual([
-      {
-        path: filename,
-        contents: binaryData.toString('base64')
-      }
-    ])
-    expect(branchFileChanges.deletions.length).toEqual(0)
-  })
-
   it('tests no changes resulting in no new branch being created', async () => {
     const commitMessage = uuidv4()
     const result = await createOrUpdateBranch(
@@ -728,6 +668,76 @@ 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
@@ -1750,6 +1760,81 @@ describe('create-or-update-branch tests', () => {
     ).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()
+  })
+
   it('tests create, squash merge, and update with identical changes (WBNB)', 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

__test__/entrypoint.sh

@@ -19,13 +19,17 @@ git clone git://127.0.0.1/repos/test-base.git /git/local/repos/test-base
 cd /git/local/repos/test-base
 git config --global user.email "you@example.com"
 git config --global user.name "Your Name"
-echo "#test-base" > README.md
+echo "#test-base" > README_TEMP.md
 git add .
 git commit -m "initial commit"
-echo "#test-base :sparkles:" > README.md
+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.md to add sparkles to the title"
+- 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

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

@@ -1,4 +1,4 @@
-import {GitCommandManager, Commit} from '../lib/git-command-manager'
+import {GitCommandManager} from '../lib/git-command-manager'
 
 const REPO_PATH = '/git/local/repos/test-base'
 
@@ -11,16 +11,38 @@ describe('git-command-manager integration tests', () => {
   })
 
   it('tests getCommit', async () => {
-    const parent = await git.getCommit('HEAD^')
+    const initialCommit = await git.getCommit('HEAD^^^')
-    const commit = await git.getCommit('HEAD')
+    const emptyCommit = await git.getCommit('HEAD^^')
-    expect(parent.subject).toEqual('initial commit')
+    const modifiedCommit = await git.getCommit('HEAD^')
-    expect(parent.changes).toEqual([
+    const headCommit = await git.getCommit('HEAD')
-      {mode: '100644', status: 'A', path: 'README.md'}
+
-    ])
+    expect(initialCommit.subject).toEqual('initial commit')
-    expect(commit.subject).toEqual('add sparkles')
+    expect(initialCommit.signed).toBeFalsy()
-    expect(commit.parents[0]).toEqual(parent.sha)
+    expect(initialCommit.changes[0].mode).toEqual('100644')
-    expect(commit.changes).toEqual([
+    expect(initialCommit.changes[0].status).toEqual('A')
-      {mode: '100644', status: 'M', path: 'README.md'}
+    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')
   })
 })

action.yml

@@ -2,11 +2,11 @@ name: 'Create Pull Request'
 description: 'Creates a pull request for changes to your repository in the actions workspace'
 inputs:
   token:
-    description: 'GITHUB_TOKEN or a `repo` scoped Personal Access Token (PAT)'
+    description: 'The token that the action will use to create and update the pull request.'
     default: ${{ github.token }}
-  git-token:
+  branch-token:
     description: >
-      The Personal Access Token (PAT) that the action will use for git operations.
+      The token that the action will use to create and update the branch.
       Defaults to the value of `token`.
   path:
     description: >
@@ -51,6 +51,9 @@ 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'
@@ -72,10 +75,12 @@ inputs:
   milestone:
     description: 'The number of the milestone to associate the pull request with.'
   draft:
-    description: 'Create a draft pull request. It is not possible to change draft status after creation except through the web interface'
+    description: >
+      Create a draft pull request.
+      Valid values are `true` (only on create), `always-true` (on create and update), and `false`.
     default: false
-  sign-commit:
+  maintainer-can-modify:
-    description: 'Sign the commit as github-actions bot (and as custom app if a different github-token is provided)'
+    description: 'Indicates whether maintainers can modify the pull request.'
     default: true
 outputs:
   pull-request-number:

dist/790.index.js

@@ -0,0 +1,16 @@
+"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

@@ -37,7 +37,7 @@ So the straightforward solution is to just not install them during the workflow
 
 - 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@v6
+  uses: peter-evans/create-pull-request@v7
   env:
     HUSKY: '0'
   ```

docs/concepts-guidelines.md

@@ -15,8 +15,12 @@ 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)
-  - [GPG commit signature verification](#gpg-commit-signature-verification)
+    - [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)
 
 ## Terminology
@@ -88,7 +92,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@v6
+      - uses: peter-evans/create-pull-request@v7
         with:
           base: ${{ github.head_ref }}
 ```
@@ -96,7 +100,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@v6
+      - uses: peter-evans/create-pull-request@v7
         with:
           base: main
 ```
@@ -146,13 +150,15 @@ 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).
 
-- 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.
+- 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 [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 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.
+- 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.
 
 ### Security
 
@@ -170,7 +176,7 @@ 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, a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) is required.
+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.
 
 ```yml
       - uses: actions/checkout@v4
@@ -180,16 +186,19 @@ Checking out a branch from a different repository from where the workflow is exe
 
       # Make changes to pull request here
 
-      - uses: peter-evans/create-pull-request@v6
+      - uses: peter-evans/create-pull-request@v7
         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 `repo` scoped [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 Classic [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:
 
@@ -207,7 +216,7 @@ How to use SSH (deploy keys) with create-pull-request action:
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
 ```
 
 ### Push pull request branches to a fork
@@ -216,11 +225,13 @@ 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 [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token).
+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.
 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.
@@ -230,19 +241,60 @@ Note that if you choose to use this method (not give the machine account `write`
 
       # Make changes to pull request here
 
-      - uses: peter-evans/create-pull-request@v6
+      - uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.MACHINE_USER_PAT }}
           push-to-fork: machine-user/fork-of-repository
 ```
 
-Note: You can also combine `push-to-fork` with [creating pull requests in a remote repository](#creating-pull-requests-in-a-remote-repository).
+> [!TIP]
+> 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.
-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 can be configured with fine-grained permissions and are scoped to only repositories where the App is installed.
-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:
 
@@ -251,36 +303,115 @@ GitHub App generated tokens are more secure than using a PAT because GitHub App
     - 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 any repository where workflows will run requiring tokens.
+3. Install the App on repositories that the action will require access to in order to create pull requests.
 
 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 [tibdex/github-app-token](https://github.com/tibdex/github-app-token) to generate a token for use with this action.
+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.
 
 ```yaml
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/create-github-app-token@v1
-
-      - 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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.generate-token.outputs.token }}
 ```
 
-### GPG commit signature verification
+#### Creating pull requests in a remote repository using GitHub App generated tokens
+
+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.
 
@@ -300,7 +431,8 @@ 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.
 
-   Note that the `committer` email address *MUST* match the email address used to create your GPG key.
+> [!IMPORTANT]
+> The `committer` email address *MUST* match the email address used to create your GPG key.
 
 ```yaml
     steps:
@@ -316,7 +448,7 @@ The action can use GPG to sign commits with a GPG key that you generate yourself
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           committer: example <email@example.com>
@@ -346,7 +478,7 @@ jobs:
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
 ```
 
 **Ubuntu container example:**
@@ -369,5 +501,5 @@ jobs:
       # Make changes to pull request here
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
 ```

docs/examples.md

@@ -49,7 +49,7 @@ jobs:
         run: |
           git log --format='%aN <%aE>%n%cN <%cE>' | sort -u > AUTHORS
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: update authors
           title: Update AUTHORS
@@ -81,7 +81,7 @@ jobs:
           git fetch origin main:main
           git reset --hard main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: production-promotion
 ```
@@ -116,7 +116,7 @@ jobs:
           ./git-chglog -o CHANGELOG.md
           rm git-chglog
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: update changelog
           title: Update Changelog
@@ -153,7 +153,7 @@ jobs:
           npx -p npm-check-updates ncu -u
           npm install
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -214,7 +214,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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -249,7 +249,7 @@ jobs:
           cargo update
           cargo upgrade --to-lockfile
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
             token: ${{ secrets.PAT }}
             commit-message: Update dependencies
@@ -307,7 +307,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@v6
+        uses: peter-evans/create-pull-request@v7
         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 +324,7 @@ jobs:
 
 ### Keep a fork up-to-date with its upstream
 
-This example is designed to be run in a seperate repository from the fork repository itself.
+This example is designed to be run in a separate 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`.
@@ -351,7 +351,7 @@ jobs:
           git fetch upstream main:upstream-main
           git reset --hard upstream-main
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           branch: upstream-changes
@@ -384,7 +384,7 @@ jobs:
             --domains quotes.toscrape.com \
             http://quotes.toscrape.com/
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: update local website copy
           title: Automated Updates to Local Website Copy
@@ -481,7 +481,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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           commit-message: autopep8 action fixes
           title: Fixes by autopep8 action
@@ -540,7 +540,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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: ${{ steps.vars.outputs.pr_title }}
           body: ${{ steps.vars.outputs.pr_body }}
@@ -566,7 +566,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@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           body: ${{ steps.template.outputs.result }}
 ```

docs/updating.md

@@ -1,3 +1,19 @@
+## 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-pull-request",
-  "version": "6.0.0",
+  "version": "7.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,35 @@
   },
   "homepage": "https://github.com/peter-evans/create-pull-request",
   "dependencies": {
-    "@actions/core": "^1.10.1",
+    "@actions/core": "^1.11.1",
     "@actions/exec": "^1.1.1",
-    "@octokit/core": "^4.2.4",
+    "@octokit/core": "^6.1.2",
-    "@octokit/graphql": "^8.1.1",
+    "@octokit/plugin-paginate-rest": "^11.3.6",
-    "@octokit/graphql-schema": "^15.25.0",
+    "@octokit/plugin-rest-endpoint-methods": "^13.2.6",
-    "@octokit/plugin-paginate-rest": "^5.0.1",
+    "@octokit/plugin-throttling": "^9.3.2",
-    "@octokit/plugin-rest-endpoint-methods": "^6.8.1",
+    "node-fetch-native": "^1.6.4",
-    "proxy-from-env": "^1.1.0",
+    "p-limit": "^6.1.0",
-    "undici": "^6.19.5",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.12",
+    "@types/jest": "^29.5.14",
-    "@types/node": "^18.19.43",
+    "@types/node": "^18.19.67",
-    "@typescript-eslint/eslint-plugin": "^7.17.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.17.0",
+    "@typescript-eslint/parser": "^7.18.0",
-    "@vercel/ncc": "^0.38.1",
+    "@vercel/ncc": "^0.38.3",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
-    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-plugin-github": "^4.10.2",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-prettier": "^5.2.1",
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "js-yaml": "^4.1.0",
-    "prettier": "^3.3.3",
+    "prettier": "^3.4.2",
-    "ts-jest": "^29.2.4",
+    "ts-jest": "^29.2.5",
-    "typescript": "^5.5.4"
+    "typescript": "^5.7.2",
+    "undici": "^6.21.0"
   }
 }

src/create-or-update-branch.ts

@@ -62,42 +62,13 @@ export async function buildBranchCommits(
   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
 }
 
-export async function buildBranchFileChanges(
-  git: GitCommandManager,
-  base: string,
-  branch: string
-): Promise<BranchFileChanges> {
-  const branchFileChanges: BranchFileChanges = {
-    additions: [],
-    deletions: []
-  }
-  const changedFiles = await git.getChangedFiles([
-    '--diff-filter=AM',
-    `${base}..${branch}`
-  ])
-  const deletedFiles = await git.getChangedFiles([
-    '--diff-filter=D',
-    `${base}..${branch}`
-  ])
-  const repoPath = git.getWorkingDirectory()
-  for (const file of changedFiles) {
-    branchFileChanges.additions!.push({
-      path: file,
-      contents: utils.readFileBase64([repoPath, file])
-    })
-  }
-  for (const file of deletedFiles) {
-    branchFileChanges.deletions!.push({
-      path: file
-    })
-  }
-  return branchFileChanges
-}
-
 // Return the number of commits that branch2 is ahead of branch1
 async function commitsAhead(
   git: GitCommandManager,
@@ -154,6 +125,31 @@ 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,22 +157,12 @@ function splitLines(multilineString: string): string[] {
     .filter(x => x !== '')
 }
 
-export interface BranchFileChanges {
-  additions: {
-    path: string
-    contents: string
-  }[]
-  deletions: {
-    path: string
-  }[]
-}
-
 interface CreateOrUpdateBranchResult {
   action: string
   base: string
   hasDiffWithBase: boolean
+  baseCommit: Commit
   headSha: string
-  branchFileChanges?: BranchFileChanges
   branchCommits: Commit[]
 }
 
@@ -202,15 +188,6 @@ 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: '',
-    branchCommits: []
-  }
-
   // Save the working base changes to a temporary branch
   const tempBranch = uuidv4()
   await git.checkout(tempBranch, 'HEAD')
@@ -290,6 +267,9 @@ export async function createOrUpdateBranch(
       ? 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))) {
     // The pull request branch does not exist
@@ -297,9 +277,9 @@ export async function createOrUpdateBranch(
     // Create the pull request branch
     await git.checkout(branch, tempBranch)
     // Check if the pull request branch is ahead of the base
-    result.hasDiffWithBase = await isAhead(git, base, branch)
+    hasDiffWithBase = await isAhead(git, base, branch)
-    if (result.hasDiffWithBase) {
+    if (hasDiffWithBase) {
-      result.action = 'created'
+      action = 'created'
       core.info(`Created branch '${branch}'`)
     } else {
       core.info(
@@ -316,20 +296,26 @@ 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 number of commits ahead of the base branch differs between the branch and
+    // - If the diff of the 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
+    //   temp branch. This catches a case where changes have been partially merged to the
-    //   a new commit.
+    //   base. The overall diff is the same, but the branch needs to be rebased to show
+    //   the correct diff.
+    //
     // For changes on base this reset is equivalent to a rebase of the pull request branch.
     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
@@ -340,27 +326,29 @@ 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))) {
-      result.action = 'updated'
+      action = 'updated'
       core.info(`Updated branch '${branch}'`)
     } else {
-      result.action = 'not-updated'
+      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
-    result.hasDiffWithBase = await isAhead(git, base, branch)
+    hasDiffWithBase = await isAhead(git, base, branch)
   }
 
-  // Build the branch commits
+  // Get the base and head SHAs
-  result.branchCommits = await buildBranchCommits(git, base, branch)
+  const baseSha = await git.revParse(base)
+  const baseCommit = await git.getCommit(baseSha)
+  const headSha = await git.revParse(branch)
 
-  // Build the branch file changes
+  let branchCommits: Commit[] = []
-  result.branchFileChanges = await buildBranchFileChanges(git, base, branch)
+  if (hasDiffWithBase) {
-
+    // Build the branch commits
-  // Get the pull request branch SHA
+    branchCommits = await buildBranchCommits(git, base, branch)
-  result.headSha = await git.revParse('HEAD')
+  }
 
   // Delete the temporary branch
   await git.exec(['branch', '--delete', '--force', tempBranch])
@@ -373,5 +361,12 @@ export async function createOrUpdateBranch(
     await git.stashPop()
   }
 
-  return result
+  return {
+    action: action,
+    base: base,
+    hasDiffWithBase: hasDiffWithBase,
+    baseCommit: baseCommit,
+    headSha: headSha,
+    branchCommits: branchCommits
+  }
 }

src/create-pull-request.ts

@@ -11,7 +11,7 @@ import * as utils from './utils'
 
 export interface Inputs {
   token: string
-  gitToken: string
+  branchToken: string
   path: string
   addPaths: string[]
   commitMessage: string
@@ -23,6 +23,7 @@ export interface Inputs {
   branchSuffix: string
   base: string
   pushToFork: string
+  signCommits: boolean
   title: string
   body: string
   bodyPath: string
@@ -31,8 +32,11 @@ export interface Inputs {
   reviewers: string[]
   teamReviewers: string[]
   milestone: number
-  draft: boolean
+  draft: {
-  signCommit: boolean
+    value: boolean
+    always: boolean
+  }
+  maintainerCanModify: boolean
 }
 
 export async function createPullRequest(inputs: Inputs): Promise<void> {
@@ -46,8 +50,11 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
 
     core.startGroup('Determining the base and head repositories')
     const baseRemote = gitConfigHelper.getGitRemote()
-    // Init the GitHub client
+    // Init the GitHub clients
-    const githubHelper = new GitHubHelper(baseRemote.hostname, inputs.token)
+    const apiUrl = await GitHubHelper.determineApiUrl(baseRemote.hostname)
+    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
@@ -58,11 +65,11 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       core.info(
         `Checking if '${branchRepository}' is a fork of '${baseRemote.repository}'`
       )
-      const baseParentRepository = await githubHelper.getRepositoryParent(
+      const baseParentRepository = await ghBranch.getRepositoryParent(
         baseRemote.repository
       )
       const branchParentRepository =
-        await githubHelper.getRepositoryParent(branchRepository)
+        await ghBranch.getRepositoryParent(branchRepository)
       if (branchParentRepository == null) {
         throw new Error(
           `Repository '${branchRepository}' is not a fork. Unable to continue.`
@@ -92,7 +99,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.gitToken)
+      await gitConfigHelper.configureToken(inputs.branchToken)
       core.endGroup()
     }
 
@@ -175,6 +182,11 @@ 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(
@@ -186,6 +198,7 @@ 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()
@@ -195,23 +208,22 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
       core.startGroup(
         `Pushing pull request branch to '${branchRemoteName}/${inputs.branch}'`
       )
-      if (inputs.signCommit) {
+      if (inputs.signCommits) {
-        // Stash any uncommitted tracked and untracked changes
+        // Create signed commits via the GitHub API
         const stashed = await git.stashPush(['--include-untracked'])
         await git.checkout(inputs.branch)
-        await githubHelper.pushSignedCommits(
+        const pushSignedCommitsResult = await ghBranch.pushSignedCommits(
           result.branchCommits,
+          result.baseCommit,
           repoPath,
           branchRepository,
           inputs.branch
         )
-        // await githubHelper.pushSignedCommit(
+        outputs.set('pull-request-head-sha', pushSignedCommitsResult.sha)
-        //   branchRepository,
+        outputs.set(
-        //   inputs.branch,
+          'pull-request-commits-verified',
-        //   inputs.base,
+          pushSignedCommitsResult.verified.toString()
-        //   inputs.commitMessage,
+        )
-        //   result.branchFileChanges
-        // )
         await git.checkout('-')
         if (stashed) {
           await git.stashPop()
@@ -227,28 +239,24 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
     }
 
     if (result.hasDiffWithBase) {
-      // Create or update the pull request
       core.startGroup('Create or update the pull request')
-      const pull = await githubHelper.createOrUpdatePullRequest(
+      const pull = await ghPull.createOrUpdatePullRequest(
         inputs,
         baseRemote.repository,
         branchRepository
       )
-      core.endGroup()
+      outputs.set('pull-request-number', pull.number.toString())
-
+      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) {
-        core.setOutput('pull-request-operation', 'created')
+        outputs.set('pull-request-operation', 'created')
       } else if (result.action == 'updated') {
-        core.setOutput('pull-request-operation', 'updated')
+        outputs.set('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)
-      core.setOutput('pull-request-branch', inputs.branch)
-      // Deprecated
-      core.exportVariable('PULL_REQUEST_NUMBER', pull.number)
       core.endGroup()
     } else {
       // There is no longer a diff with the base
@@ -265,13 +273,45 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
             branchRemoteName,
             `refs/heads/${inputs.branch}`
           ])
-          // Set outputs
+          outputs.set('pull-request-operation', 'closed')
-          core.startGroup('Setting outputs')
-          core.setOutput('pull-request-operation', 'closed')
-          core.endGroup()
         }
       }
     }
+
+    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.info(`${key} = ${value}`)
+      core.setOutput(key, value)
+    }
+    core.endGroup()
   } catch (error) {
     core.setFailed(utils.getErrorMessage(error))
   } finally {

src/git-command-manager.ts

@@ -9,13 +9,16 @@ 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 {
@@ -157,34 +160,39 @@ export class GitCommandManager {
       'show',
       '--raw',
       '--cc',
-      '--diff-filter=AMD',
+      '--no-renames',
-      `--format=%H%n%T%n%P%n%s%n%b%n${endOfBody}`,
+      '--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(' '),
-      subject: detailLines[3],
+      signed: detailLines[3] !== 'N',
-      body: detailLines.slice(4, endOfBodyIndex).join('\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{7} \w{7} ([AMD])\s+(.*)$/
+          /^:(\d{6}) (\d{6}) \w{40} (\w{40}) ([AMD])\s+(.*)$/
         )
         if (change) {
           return {
-            mode: change[3] === 'D' ? change[1] : change[2],
+            mode: change[4] === 'D' ? change[1] : change[2],
-            status: change[3],
+            dstSha: change[3],
-            path: change[4]
+            status: change[4],
+            path: change[5]
           }
         } else {
-          throw new Error(`Unexpected line format: ${line}`)
+          unparsedChanges.push(line)
         }
-      })
+      }),
+      unparsedChanges: unparsedChanges
     }
   }
 
@@ -216,15 +224,6 @@ export class GitCommandManager {
     return output.exitCode === 1
   }
 
-  async getChangedFiles(options?: string[]): Promise<string[]> {
-    const args = ['diff', '--name-only']
-    if (options) {
-      args.push(...options)
-    }
-    const output = await this.exec(args)
-    return output.stdout.split('\n').filter(filename => filename != '')
-  }
-
   async isDirty(untracked: boolean, pathspec?: string[]): Promise<boolean> {
     const pathspecArgs = pathspec ? ['--', ...pathspec] : []
     // Check untracked changes

src/github-helper.ts

@@ -1,18 +1,16 @@
 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 type {
+import pLimit from 'p-limit'
-  Repository as TempRepository,
-  Ref,
-  Commit as CommitTemp,
-  FileChanges
-} from '@octokit/graphql-schema'
-import {BranchFileChanges} from './create-or-update-branch'
 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
@@ -22,32 +20,75 @@ 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'
+  type: 'blob' | 'commit'
 }
 
 export class GitHubHelper {
   private octokit: InstanceType<typeof Octokit>
 
-  constructor(githubServerHostname: string, token: string) {
+  constructor(apiUrl: string, token: string) {
     const options: OctokitOptions = {}
     if (token) {
       options.auth = `${token}`
     }
-    if (githubServerHostname !== 'github.com') {
+    options.baseUrl = apiUrl
-      options.baseUrl = `https://${githubServerHostname}/api/v3`
+    options.throttle = throttleOptions
-    } else {
-      options.baseUrl = 'https://api.github.com'
-    }
     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 {
@@ -74,7 +115,8 @@ export class GitHubHelper {
         head_repo: headRepository,
         base: inputs.base,
         body: inputs.body,
-        draft: inputs.draft
+        draft: inputs.draft.value,
+        maintainer_can_modify: inputs.maintainerCanModify
       })
       core.info(
         `Created pull request #${pull.number} (${headBranch} => ${inputs.base})`
@@ -82,13 +124,22 @@ export class GitHubHelper {
       return {
         number: pull.number,
         html_url: pull.html_url,
+        node_id: pull.node_id,
+        draft: pull.draft,
         created: true
       }
     } catch (e) {
-      if (
+      const errorMessage = utils.getErrorMessage(e)
-        utils.getErrorMessage(e).includes(`A pull request already exists for`)
+      if (errorMessage.includes(ERROR_PR_ALREADY_EXISTS)) {
-      ) {
         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
       }
@@ -115,6 +166,8 @@ export class GitHubHelper {
     return {
       number: pull.number,
       html_url: pull.html_url,
+      node_id: pull.node_id,
+      draft: pull.draft,
       created: false
     }
   }
@@ -202,66 +255,138 @@ export class GitHubHelper {
 
   async pushSignedCommits(
     branchCommits: Commit[],
+    baseCommit: Commit,
     repoPath: string,
     branchRepository: string,
     branch: string
-  ): Promise<void> {
+  ): Promise<CommitResponse> {
-    let headSha = ''
+    let headCommit: CommitResponse = {
-    for (const commit of branchCommits) {
+      sha: baseCommit.sha,
-      headSha = await this.createCommit(commit, repoPath, branchRepository)
+      tree: baseCommit.tree,
+      verified: false
     }
-    await this.createOrUpdateRef(branchRepository, branch, headSha)
+    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<string> {
+  ): Promise<CommitResponse> {
     const repository = this.parseRepository(branchRepository)
-    let treeSha = commit.tree
+    // In the case of an empty commit, the tree references the parent's tree
+    let treeSha = parentCommit.tree
     if (commit.changes.length > 0) {
-      core.debug(`Creating tree objects for local commit ${commit.sha}`)
+      core.info(`Creating tree objects for local commit ${commit.sha}`)
       const treeObjects = await Promise.all(
-        commit.changes.map(async ({path, mode, status}) => {
+        commit.changes.map(async ({path, mode, status, dstSha}) => {
-          let sha: string | null = null
+          if (mode === '160000') {
-          if (status === 'A' || status === 'M') {
+            // submodule
-            core.debug(`Creating blob for file '${path}'`)
+            core.info(`Creating tree object for submodule commit at '${path}'`)
-            const {data: blob} = await this.octokit.rest.git.createBlob({
+            return <TreeObject>{
-              ...repository,
+              path,
-              content: utils.readFileBase64([repoPath, path]),
+              mode,
-              encoding: 'base64'
+              sha: dstSha,
-            })
+              type: 'commit'
-            sha = blob.sha
+            }
-          }
+          } else {
-          return <TreeObject>{
+            let sha: string | null = null
-            path,
+            if (status === 'A' || status === 'M') {
-            mode,
+              try {
-            sha,
+                const {data: blob} = await blobCreationLimit(() =>
-            type: 'blob'
+                  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'
+            }
           }
         })
       )
-      core.debug(`Creating tree for local commit ${commit.sha}`)
+
-      const {data: tree} = await this.octokit.rest.git.createTree({
+      const chunkSize = 100
-        ...repository,
+      const chunkedTreeObjects: TreeObject[][] = Array.from(
-        base_tree: commit.parents[0],
+        {length: Math.ceil(treeObjects.length / chunkSize)},
-        tree: treeObjects
+        (_, i) => treeObjects.slice(i * chunkSize, i * chunkSize + chunkSize)
-      })
+      )
-      treeSha = tree.sha
+
-      core.debug(`Created tree ${treeSha} for local commit ${commit.sha}`)
+      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: commit.parents,
+      parents: [parentCommit.sha],
       tree: treeSha,
       message: `${commit.subject}\n\n${commit.body}`
     })
-    core.debug(
+    core.info(
       `Created commit ${remoteCommit.sha} for local commit ${commit.sha}`
     )
-    return remoteCommit.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(
@@ -270,10 +395,10 @@ export class GitHubHelper {
     newHead: string
   ) {
     const repository = this.parseRepository(branchRepository)
-    const branchExists = await this.octokit.rest.git
+    const branchExists = await this.octokit.rest.repos
-      .getRef({
+      .getBranch({
         ...repository,
-        ref: branch
+        branch: branch
       })
       .then(
         () => true,
@@ -281,14 +406,15 @@ export class GitHubHelper {
       )
 
     if (branchExists) {
-      core.debug(`Branch ${branch} exists, updating ref`)
+      core.info(`Branch ${branch} exists; Updating ref`)
       await this.octokit.rest.git.updateRef({
         ...repository,
         sha: newHead,
-        ref: `heads/${branch}`
+        ref: `heads/${branch}`,
+        force: true
       })
     } else {
-      core.debug(`Branch ${branch} does not exist, creating ref`)
+      core.info(`Branch ${branch} does not exist; Creating ref`)
       await this.octokit.rest.git.createRef({
         ...repository,
         sha: newHead,
@@ -297,170 +423,17 @@ export class GitHubHelper {
     }
   }
 
-  async pushSignedCommit(
+  async convertToDraft(id: string): Promise<void> {
-    branchRepository: string,
+    core.info(`Converting pull request to draft`)
-    branch: string,
+    await this.octokit.graphql({
-    base: string,
+      query: `mutation($pullRequestId: ID!) {
-    commitMessage: string,
+        convertPullRequestToDraft(input: {pullRequestId: $pullRequestId}) {
-    branchFileChanges?: BranchFileChanges
+          pullRequest {
-  ): Promise<void> {
+            isDraft
-    core.info(`Use API to push a signed commit`)
-
-    const [repoOwner, repoName] = branchRepository.split('/')
-    core.debug(`repoOwner: '${repoOwner}', repoName: '${repoName}'`)
-    const refQuery = `
-        query GetRefId($repoName: String!, $repoOwner: String!, $branchName: String!) {
-          repository(owner: $repoOwner, name: $repoName){
-            id
-            ref(qualifiedName: $branchName){
-              id
-              name
-              prefix
-              target{
-                id
-                oid
-                commitUrl
-                commitResourcePath
-                abbreviatedOid
-              }
-            }
-          },
-        }
-      `
-
-    let branchRef = await this.octokit.graphql<{repository: TempRepository}>(
-      refQuery,
-      {
-        repoOwner: repoOwner,
-        repoName: repoName,
-        branchName: branch
-      }
-    )
-    core.debug(
-      `Fetched information for branch '${branch}' - '${JSON.stringify(branchRef)}'`
-    )
-
-    // if the branch does not exist, then first we need to create the branch from base
-    if (branchRef.repository.ref == null) {
-      core.debug(`Branch does not exist - '${branch}'`)
-      branchRef = await this.octokit.graphql<{repository: TempRepository}>(
-        refQuery,
-        {
-          repoOwner: repoOwner,
-          repoName: repoName,
-          branchName: base
-        }
-      )
-      core.debug(
-        `Fetched information for base branch '${base}' - '${JSON.stringify(branchRef)}'`
-      )
-
-      core.info(
-        `Creating new branch '${branch}' from '${base}', with ref '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`
-      )
-      if (branchRef.repository.ref != null) {
-        core.debug(`Send request for creating new branch`)
-        const newBranchMutation = `
-          mutation CreateNewBranch($branchName: String!, $oid: GitObjectID!, $repoId: ID!) {
-            createRef(input: {
-              name: $branchName,
-              oid: $oid,
-              repositoryId: $repoId
-            }) {
-              ref {
-                id
-                name
-                prefix
-              }
-            }
-          }
-        `
-        const newBranch = await this.octokit.graphql<{createRef: {ref: Ref}}>(
-          newBranchMutation,
-          {
-            repoId: branchRef.repository.id,
-            oid: branchRef.repository.ref.target!.oid,
-            branchName: 'refs/heads/' + branch
-          }
-        )
-        core.debug(
-          `Created new branch '${branch}': '${JSON.stringify(newBranch.createRef.ref)}'`
-        )
-      }
-    }
-    core.info(
-      `Hash ref of branch '${branch}' is '${JSON.stringify(branchRef.repository.ref!.target!.oid)}'`
-    )
-
-    const fileChanges = <FileChanges>{
-      additions: branchFileChanges!.additions,
-      deletions: branchFileChanges!.deletions
-    }
-
-    const pushCommitMutation = `
-      mutation PushCommit(
-        $repoNameWithOwner: String!,
-        $branchName: String!,
-        $headOid: GitObjectID!,
-        $commitMessage: String!,
-        $fileChanges: FileChanges
-      ) {
-        createCommitOnBranch(input: {
-          branch: {
-            repositoryNameWithOwner: $repoNameWithOwner,
-            branchName: $branchName,
-          }
-          fileChanges: $fileChanges
-          message: {
-            headline: $commitMessage
-          }
-          expectedHeadOid: $headOid
-        }){
-          clientMutationId
-          ref{
-            id
-            name
-            prefix
-          }
-          commit{
-            id
-            abbreviatedOid
-            oid
           }
         }
-      }
+      }`,
-    `
+      pullRequestId: id
-    const pushCommitVars = {
+    })
-      branchName: branch,
-      repoNameWithOwner: repoOwner + '/' + repoName,
-      headOid: branchRef.repository.ref!.target!.oid,
-      commitMessage: commitMessage,
-      fileChanges: fileChanges
-    }
-
-    const pushCommitVarsWithoutContents = {
-      ...pushCommitVars,
-      fileChanges: {
-        ...pushCommitVars.fileChanges,
-        additions: pushCommitVars.fileChanges.additions?.map(addition => {
-          // eslint-disable-next-line @typescript-eslint/no-unused-vars
-          const {contents, ...rest} = addition
-          return rest
-        })
-      }
-    }
-
-    core.debug(
-      `Push commit with payload: '${JSON.stringify(pushCommitVarsWithoutContents)}'`
-    )
-
-    const commit = await this.octokit.graphql<{
-      createCommitOnBranch: {ref: Ref; commit: CommitTemp}
-    }>(pushCommitMutation, pushCommitVars)
-
-    core.debug(`Pushed commit - '${JSON.stringify(commit)}'`)
-    core.info(
-      `Pushed commit with hash - '${commit.createCommitOnBranch.commit.oid}' on branch - '${commit.createCommitOnBranch.ref.name}'`
-    )
   }
 }

src/main.ts

@@ -3,11 +3,19 @@ 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'),
-      gitToken: core.getInput('git-token'),
+      branchToken: core.getInput('branch-token'),
       path: core.getInput('path'),
       addPaths: utils.getInputAsArray('add-paths'),
       commitMessage: core.getInput('commit-message'),
@@ -19,6 +27,7 @@ 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'),
@@ -27,16 +36,16 @@ async function run(): Promise<void> {
       reviewers: utils.getInputAsArray('reviewers'),
       teamReviewers: utils.getInputAsArray('team-reviewers'),
       milestone: Number(core.getInput('milestone')),
-      draft: core.getBooleanInput('draft'),
+      draft: getDraftInput(),
-      signCommit: core.getBooleanInput('sign-commit')
+      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.gitToken) {
+    if (!inputs.branchToken) {
-      inputs.gitToken = inputs.token
+      inputs.branchToken = inputs.token
     }
     if (inputs.bodyPath) {
       if (!utils.fileExistsSync(inputs.bodyPath)) {

src/octokit-client.ts

@@ -1,34 +1,40 @@
-import {Octokit as Core} from '@octokit/core'
+import * as core from '@actions/core'
+import {Octokit as OctokitCore} from '@octokit/core'
 import {paginateRest} from '@octokit/plugin-paginate-rest'
 import {restEndpointMethods} from '@octokit/plugin-rest-endpoint-methods'
-import {getProxyForUrl} from 'proxy-from-env'
+import {throttling} from '@octokit/plugin-throttling'
-import {ProxyAgent, fetch as undiciFetch} from 'undici'
+import {fetch} from 'node-fetch-native/proxy'
 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 = Core.plugin(
+export const Octokit = OctokitCore.plugin(
   paginateRest,
   restEndpointMethods,
+  throttling,
   autoProxyAgent
 )
 
-const proxyFetch =
+export const throttleOptions = {
-  (proxyUrl: string): typeof undiciFetch =>
+  onRateLimit: (retryAfter, options, _, retryCount) => {
-  (url, opts) => {
+    core.debug(`Hit rate limit for request ${options.method} ${options.url}`)
-    return undiciFetch(url, {
+    // Retries twice for a total of three attempts
-      ...opts,
+    if (retryCount < 2) {
-      dispatcher: new ProxyAgent({
+      core.debug(`Retrying after ${retryAfter} seconds!`)
-        uri: proxyUrl
+      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: Core) {
+function autoProxyAgent(octokit: OctokitCore) {
   octokit.hook.before('request', options => {
-    const proxy = getProxyForUrl(options.baseUrl)
+    options.request.fetch = fetch
-    if (proxy) {
-      options.request.fetch = proxyFetch(proxy)
-    }
   })
 }

src/utils.ts

@@ -127,7 +127,13 @@ export function readFile(path: string): string {
 }
 
 export function readFileBase64(pathParts: string[]): string {
-  return fs.readFileSync(path.resolve(...pathParts)).toString('base64')
+  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 */