v5 (#1792 )

* feat: restore working base branch and uncommitted changes * docs: uncommitted changes are stashed and restored * docs: add major version notes * fix: update package version * fix: update package-lock * feat: revise proxy implementation * docs: add notes for the revised proxy implementation * feat: set and remove git safe directory * docs: add notes for the git safe directory feature * fix: use base url for proxy check * feat: determine the git dir with rev-parse * build: update package lock * fix: remove support for ghes alpha * feat: revise handling of team reviewers * docs: update notes * feat: body-path * docs: update to v5 * docs: update to v5 * build: fix package lock
build(deps-dev): bump eslint from 8.36.0 to 8.37.0 (#1803 )
2023-04-05 08:41:18 +09:00 · 2023-04-04 13:07:02 +00:00 · 2023-04-04 13:06:32 +00:00 · 2023-04-04 13:00:36 +00:00 · 2023-04-04 13:00:18 +00:00 · 2023-04-04 12:59:42 +00:00
27 changed files with 5011 additions and 9065 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -0,0 +1 @@
+github: peter-evans
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -4,5 +4,17 @@ updates:
    directory: "/"
    schedule:
      interval: "weekly"
+      day: "tuesday"
+    labels:
+      - "dependencies"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "tuesday"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
    labels:
      - "dependencies"
--- a/.github/workflows/automerge-dependabot.yml
+++ b/.github/workflows/automerge-dependabot.yml
@ -0,0 +1,13 @@
+name: Auto-merge Dependabot
+on: pull_request
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - uses: peter-evans/enable-pull-request-automerge@v3
+        with:
+          token: ${{ secrets.ACTIONS_BOT_TOKEN }}
+          pull-request-number: ${{ github.event.pull_request.number }}
+          merge-method: squash
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -10,6 +10,11 @@ on:
    paths-ignore:
      - 'README.md'
      - 'docs/**'
+
+permissions:
+  pull-requests: write
+  contents: write
+
 jobs:
  build:
    runs-on: ubuntu-latest
@ -72,7 +77,7 @@ jobs:
            Auto-generated by [create-pull-request][1]

            [1]: https://github.com/peter-evans/create-pull-request
-          branch: ci-test-${{ matrix.target }}
+          branch: ci-test-${{ matrix.target }}-${{ github.sha }}

      - name: Close Pull
        uses: peter-evans/close-pull@v2
@ -118,6 +123,7 @@ jobs:
      - name: Create Pull Request
        uses: peter-evans/create-pull-request@v4
        with:
+          token: ${{ secrets.ACTIONS_BOT_TOKEN }}
          commit-message: 'build: update distribution'
          title: Update distribution
          body: |
--- a/.github/workflows/slash-command-dispatch.yml
+++ b/.github/workflows/slash-command-dispatch.yml
@ -18,6 +18,12 @@ jobs:
                "repository": "peter-evans/create-pull-request-tests",
                "named_args": true
              },
+              {
+                "command": "testv4",
+                "permission": "admin",
+                "repository": "peter-evans/create-pull-request-tests",
+                "named_args": true
+              },
              {
                "command": "clean",
                "permission": "admin",
--- a/.github/workflows/update-major-version.yml
+++ b/.github/workflows/update-major-version.yml
@ -0,0 +1,32 @@
+name: Update Major Version
+run-name: Update ${{ github.event.inputs.main_version }} to ${{ github.event.inputs.target }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      target:
+        description: The target tag or reference
+        required: true
+      main_version:
+        type: choice
+        description: The major version tag to update
+        options:
+          - v4
+          - v5
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.ACTIONS_BOT_TOKEN }}
+        fetch-depth: 0
+    - name: Git config
+      run: |
+        git config user.name actions-bot
+        git config user.email actions-bot@users.noreply.github.com
+    - name: Tag new target
+      run: git tag -f ${{ github.event.inputs.main_version }} ${{ github.event.inputs.target }}
+    - name: Push new tag
+      run: git push origin ${{ github.event.inputs.main_version }} --force
--- a/README.md
+++ b/README.md
@ -21,7 +21,7 @@ Create Pull Request action will:

 - [Concepts, guidelines and advanced usage](docs/concepts-guidelines.md)
 - [Examples](docs/examples.md)
- [Updating to v4](docs/updating.md)
+- [Updating to v5](docs/updating.md)

 ## Usage

@ -31,10 +31,10 @@ Create Pull Request action will:
      # Make changes to pull request here

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
 ```

-You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v4.x.x`
+You can also pin to a [specific release](https://github.com/peter-evans/create-pull-request/releases) version in the format `@v5.x.x`

 ### Workflow permissions

@ -59,23 +59,24 @@ All inputs are **optional**. If not set, sensible defaults will be used.
 | `author` | The author name and email address in the format `Display Name <email@address.com>`. Defaults to the user who triggered the workflow run. | `${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>` |
 | `signoff` | Add [`Signed-off-by`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff) line by the committer at the end of the commit log message. | `false` |
 | `branch` | The pull request branch name. | `create-pull-request/patch` |
-| `delete-branch` | Delete the `branch` when closing pull requests, and when undeleted after merging. Recommend `true`. | `false` |
+| `delete-branch` | Delete the `branch` when closing pull requests, and when undeleted after merging. | `false` |
 | `branch-suffix` | The branch suffix type when using the alternative branching strategy. Valid values are `random`, `timestamp` and `short-commit-hash`. See [Alternative strategy](#alternative-strategy---always-create-a-new-pull-request-branch) for details. | |
 | `base` | Sets the pull request base branch. | Defaults to the branch checked out in the workflow. |
 | `push-to-fork` | A fork of the checked-out parent repository to which the pull request branch will be pushed. e.g. `owner/repo-fork`. The pull request will be created to merge the fork's branch into the parent's base. See [push pull request branches to a fork](docs/concepts-guidelines.md#push-pull-request-branches-to-a-fork) for details. | |
 | `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`. | |
 | `labels` | A comma or newline-separated list of labels. | |
 | `assignees` | A comma or newline-separated list of assignees (GitHub usernames). | |
 | `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) may be required. See [this issue](https://github.com/peter-evans/create-pull-request/issues/155). If using a GitHub App, refer to [Authenticating with GitHub App generated tokens](docs/concepts-guidelines.md#authenticating-with-github-app-generated-tokens) for the proper permissions. | |
+| `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` |

 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@v4
+        uses: peter-evans/create-pull-request@v5
        env:
          https_proxy: http://<proxy_address>:<port>
 ```
@ -95,7 +96,7 @@ Note that in order to read the step outputs the action step must have an id.
 ```yml
      - name: Create Pull Request
        id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
      - name: Check outputs
        if: ${{ steps.cpr.outputs.pull-request-number }}
        run: |
@ -154,11 +155,11 @@ If there are files or directories you want to ignore you can simply add them to

 You can control which files are committed with the `add-paths` input.
 Paths should follow git's [pathspec](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefpathspecapathspec) syntax.
-All file changes that do not match one of the paths will be discarded.
+File changes that do not match one of the paths will be stashed and restored after the action has completed.

 ```yml
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          add-paths: |
            *.java
@ -185,7 +186,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@v4
+        uses: peter-evans/create-pull-request@v5
 ```

 ### Create a project card
@ -195,7 +196,7 @@ To create a project card for the pull request, pass the `pull-request-number` st
 ```yml
      - name: Create Pull Request
        id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5

      - name: Create or Update Project Card
        if: ${{ steps.cpr.outputs.pull-request-number }}
@ -230,7 +231,7 @@ jobs:

      - name: Create Pull Request
        id: cpr
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.PAT }}
          commit-message: Update report
@ -252,8 +253,8 @@ jobs:
          assignees: peter-evans
          reviewers: peter-evans
          team-reviewers: |
-            owners
-            maintainers
+            developers
+            qa-team
          milestone: 1
          draft: false
 ```
--- a/test/create-or-update-branch.int.test.ts
+++ b/test/create-or-update-branch.int.test.ts
@ -14,7 +14,7 @@ const REMOTE_NAME = 'origin'
 const TRACKED_FILE = 'a/tracked-file.txt'
 const UNTRACKED_FILE = 'b/untracked-file.txt'

-const DEFAULT_BRANCH = 'tests/master'
+const DEFAULT_BRANCH = 'tests/main'
 const NOT_BASE_BRANCH = 'tests/branch-that-is-not-the-base'
 const NOT_EXIST_BRANCH = 'tests/branch-that-does-not-exist'

@ -108,10 +108,10 @@ describe('create-or-update-branch tests', () => {
    // Check there are no local changes that might be destroyed by running these tests
    expect(await git.isDirty(true)).toBeFalsy()
    // Fetch the default branch
-    await git.fetch(['master:refs/remotes/origin/master'])
+    await git.fetch(['main:refs/remotes/origin/main'])

    // Create a "not base branch" for the test run
-    await git.checkout('master')
+    await git.checkout('main')
    await git.checkout(NOT_BASE_BRANCH, 'HEAD')
    await createFile(TRACKED_FILE)
    await git.exec(['add', '-A'])
@ -123,7 +123,7 @@ describe('create-or-update-branch tests', () => {
    ])

    // Create a new default branch for the test run with a tracked file
-    await git.checkout('master')
+    await git.checkout('main')
    await git.checkout(DEFAULT_BRANCH, 'HEAD')
    await createFile(TRACKED_FILE)
    await git.exec(['add', '-A'])
@ -245,6 +245,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(TRACKED_FILE)).toEqual(trackedContent)
    expect(
@ -273,6 +274,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_trackedContent)
@ -294,6 +296,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent)
    expect(
@ -322,6 +325,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent)
@ -345,6 +349,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -374,6 +379,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('not-updated')
    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
@ -395,6 +401,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -432,6 +439,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -463,6 +471,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -491,6 +500,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(defaultTrackedContent)
@ -512,6 +522,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -552,6 +563,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -579,6 +591,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -622,6 +635,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -631,6 +645,71 @@ describe('create-or-update-branch tests', () => {
    ).toBeTruthy()
  })

+  it('tests create, force push of base branch, and update with identical changes', async () => {
+    // If the base branch is force pushed to a different commit when there is an open
+    // pull request, the branch must be reset to rebase the changes on 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()
+
+    // Force push the base branch to a different commit
+    const amendedCommitMessage = uuidv4()
+    await git.commit(['--amend', '-m', amendedCommitMessage])
+    await git.push([
+      '--force',
+      REMOTE_NAME,
+      `HEAD:refs/heads/${DEFAULT_BRANCH}`
+    ])
+
+    // Create the same tracked and untracked file changes (no change on update)
+    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, amendedCommitMessage])
+    ).toBeTruthy()
+  })
+
  it('tests create and update with commits on the working base (during the workflow)', async () => {
    // Create commits on the working base
    const commits = await createCommits(git)
@ -644,6 +723,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(TRACKED_FILE)).toEqual(commits.changes.tracked)
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(
@ -675,6 +755,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_commits.changes.tracked)
@ -701,6 +782,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -736,6 +818,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -764,6 +847,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -807,6 +891,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -834,6 +919,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -863,6 +949,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -885,6 +972,7 @@ describe('create-or-update-branch tests', () => {
      true,
      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)
@ -921,6 +1009,7 @@ describe('create-or-update-branch tests', () => {
      true,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -950,6 +1039,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_MULTI
    )
+    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)
@ -979,6 +1069,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_MULTI
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -1001,6 +1092,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_WILDCARD
    )
+    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)
@ -1030,6 +1122,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_WILDCARD
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -1052,10 +1145,55 @@ describe('create-or-update-branch tests', () => {
      false,
      ['nonexistent/*']
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('none')
    expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
  })

+  it('tests create consecutive branches with restored changes from stash', async () => {
+    const BRANCHA = `${BRANCH}-a`
+    const BRANCHB = `${BRANCH}-b`
+
+    // Create tracked and untracked file changes
+    const changes = await createChanges()
+    const commitMessage = uuidv4()
+    const resultA = await createOrUpdateBranch(
+      git,
+      commitMessage,
+      '',
+      BRANCHA,
+      REMOTE_NAME,
+      false,
+      ['a']
+    )
+    const resultB = await createOrUpdateBranch(
+      git,
+      commitMessage,
+      '',
+      BRANCHB,
+      REMOTE_NAME,
+      false,
+      ['b']
+    )
+    await git.checkout(BRANCHA)
+    expect(resultA.action).toEqual('created')
+    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
+    expect(
+      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
+    ).toBeTruthy()
+    await git.checkout(BRANCHB)
+    expect(resultB.action).toEqual('created')
+    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
+    expect(
+      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
+    ).toBeTruthy()
+
+    // Delete the local branches
+    await git.checkout(DEFAULT_BRANCH)
+    await git.exec(['branch', '--delete', '--force', BRANCHA])
+    await git.exec(['branch', '--delete', '--force', BRANCHB])
+  })
+
  // Working Base is Not Base (WBNB)

  it('tests no changes resulting in no new branch being created (WBNB)', async () => {
@ -1072,6 +1210,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('none')
    expect(await gitLogMatches([INIT_COMMIT_MESSAGE])).toBeTruthy()
  })
@ -1092,6 +1231,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(TRACKED_FILE)).toEqual(trackedContent)
    expect(
@ -1123,6 +1263,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_trackedContent)
@ -1147,6 +1288,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(untrackedContent)
    expect(
@ -1178,6 +1320,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(_untrackedContent)
@ -1204,6 +1347,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1236,6 +1380,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('not-updated')
    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
@ -1260,6 +1405,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1300,6 +1446,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1334,6 +1481,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1365,6 +1513,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(defaultTrackedContent)
@ -1391,6 +1540,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1434,6 +1584,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -1464,6 +1615,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1510,6 +1662,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeFalsy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_changes.tracked)
@ -1519,6 +1672,77 @@ describe('create-or-update-branch tests', () => {
    ).toBeTruthy()
  })

+  it('tests create, force push of base branch, and update with identical changes (WBNB)', async () => {
+    // If the base branch is force pushed to a different commit when there is an open
+    // pull request, the branch must be reset to rebase the changes on 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()
+
+    // Force push the base branch to a different commit
+    const amendedCommitMessage = uuidv4()
+    await git.commit(['--amend', '-m', amendedCommitMessage])
+    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 (no change on update)
+    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, amendedCommitMessage])
+    ).toBeTruthy()
+  })
+
  it('tests create and update with commits on the working base (during the workflow) (WBNB)', async () => {
    // Set the working base to a branch that is not the pull request base
    await git.checkout(NOT_BASE_BRANCH)
@ -1535,6 +1759,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(result.action).toEqual('created')
    expect(await getFileContent(TRACKED_FILE)).toEqual(commits.changes.tracked)
    expect(await getFileContent(UNTRACKED_FILE)).toEqual(
@ -1569,6 +1794,7 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    expect(_result.action).toEqual('updated')
    expect(_result.hasDiffWithBase).toBeTruthy()
    expect(await getFileContent(TRACKED_FILE)).toEqual(_commits.changes.tracked)
@ -1598,6 +1824,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1636,6 +1863,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1667,6 +1895,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1713,6 +1942,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1743,6 +1973,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1775,6 +2006,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1804,6 +2036,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1837,6 +2070,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1863,6 +2097,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1904,6 +2139,7 @@ describe('create-or-update-branch tests', () => {
      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)
@ -1936,7 +2172,56 @@ describe('create-or-update-branch tests', () => {
      false,
      ADD_PATHS_DEFAULT
    )
+    await git.checkout(BRANCH)
    // The action cannot successfully create the branch
    expect(result.action).toEqual('none')
  })
+
+  it('tests create consecutive branches with restored changes from stash in detached HEAD state (WBNR)', async () => {
+    // Checkout the HEAD commit SHA
+    const headSha = await git.revParse('HEAD')
+    await git.checkout(headSha)
+
+    const BRANCHA = `${BRANCH}-a`
+    const BRANCHB = `${BRANCH}-b`
+
+    // Create tracked and untracked file changes
+    const changes = await createChanges()
+    const commitMessage = uuidv4()
+    const resultA = await createOrUpdateBranch(
+      git,
+      commitMessage,
+      BASE,
+      BRANCHA,
+      REMOTE_NAME,
+      false,
+      ['a']
+    )
+    const resultB = await createOrUpdateBranch(
+      git,
+      commitMessage,
+      BASE,
+      BRANCHB,
+      REMOTE_NAME,
+      false,
+      ['b']
+    )
+    await git.checkout(BRANCHA)
+    expect(resultA.action).toEqual('created')
+    expect(await getFileContent(TRACKED_FILE)).toEqual(changes.tracked)
+    expect(
+      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
+    ).toBeTruthy()
+    await git.checkout(BRANCHB)
+    expect(resultB.action).toEqual('created')
+    expect(await getFileContent(UNTRACKED_FILE)).toEqual(changes.untracked)
+    expect(
+      await gitLogMatches([commitMessage, INIT_COMMIT_MESSAGE])
+    ).toBeTruthy()
+
+    // Delete the local branches
+    await git.checkout(DEFAULT_BRANCH)
+    await git.exec(['branch', '--delete', '--force', BRANCHA])
+    await git.exec(['branch', '--delete', '--force', BRANCHB])
+  })
 })
--- a/test/entrypoint.sh
+++ b/test/entrypoint.sh
@ -6,6 +6,7 @@ WORKINGDIR=$PWD

 # Create and serve a remote repo
 mkdir -p /git/remote
+git config --global init.defaultBranch main
 git init --bare /git/remote/test-base.git
 git daemon --verbose --enable=receive-pack --base-path=/git/remote --export-all /git/remote &>/dev/null &

--- a/test/git-auth-helper.int.test.ts
+++ b/test/git-auth-helper.int.test.ts
@ -46,4 +46,25 @@ describe('git-auth-helper tests', () => {

    await gitAuthHelper.removeAuth()
  })
+
+  it('tests adding and removing the safe.directory config', async () => {
+    await git.config('safe.directory', '/another-value', true, true)
+
+    await gitAuthHelper.removeSafeDirectory()
+    await gitAuthHelper.addSafeDirectory()
+
+    expect(
+      await git.configExists('safe.directory', REPO_PATH, true)
+    ).toBeTruthy()
+
+    await gitAuthHelper.addSafeDirectory()
+    await gitAuthHelper.removeSafeDirectory()
+
+    expect(
+      await git.configExists('safe.directory', REPO_PATH, true)
+    ).toBeFalsy()
+    expect(
+      await git.configExists('safe.directory', '/another-value', true)
+    ).toBeTruthy()
+  })
 })
--- a/test/integration-tests.sh
+++ b/test/integration-tests.sh
@ -8,7 +8,7 @@ if [[ "$(docker images -q $IMAGE 2> /dev/null)" == "" || $ARG1 == "build" ]]; th
    echo "Building Docker image $IMAGE ..."

    cat > Dockerfile << EOF
-FROM node:12-alpine
+FROM node:16-alpine
 RUN apk --no-cache add git git-daemon
 RUN npm install jest jest-environment-jsdom --global
 WORKDIR /cpr
--- a/test/utils.unit.test.ts
+++ b/test/utils.unit.test.ts
@ -25,6 +25,18 @@ describe('utils tests', () => {
    expect(array2.length).toEqual(0)
  })

+  test('stripOrgPrefixFromTeams strips org prefixes correctly', async () => {
+    const array = utils.stripOrgPrefixFromTeams([
+      'org/team1',
+      'org/team2',
+      'team3'
+    ])
+    expect(array.length).toEqual(3)
+    expect(array[0]).toEqual('team1')
+    expect(array[1]).toEqual('team2')
+    expect(array[2]).toEqual('team3')
+  })
+
  test('getRepoPath successfully returns the path to the repository', async () => {
    expect(utils.getRepoPath()).toEqual(process.env['GITHUB_WORKSPACE'])
    expect(utils.getRepoPath('foo')).toEqual(
@ -56,6 +68,24 @@ describe('utils tests', () => {
    )
    expect(remote4.protocol).toEqual('HTTPS')
    expect(remote4.repository).toEqual('peter-evans/create-pull-request')
+
+    const remote5 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/ungit'
+    )
+    expect(remote5.protocol).toEqual('HTTPS')
+    expect(remote5.repository).toEqual('peter-evans/ungit')
+
+    const remote6 = utils.getRemoteDetail(
+      'https://github.com/peter-evans/ungit.git'
+    )
+    expect(remote6.protocol).toEqual('HTTPS')
+    expect(remote6.repository).toEqual('peter-evans/ungit')
+
+    const remote7 = utils.getRemoteDetail(
+      'git@github.com:peter-evans/ungit.git'
+    )
+    expect(remote7.protocol).toEqual('SSH')
+    expect(remote7.repository).toEqual('peter-evans/ungit')
  })

  test('getRemoteDetail fails to parse a remote URL', async () => {
@ -72,11 +102,28 @@ describe('utils tests', () => {
  })

  test('getRemoteUrl successfully returns remote URLs', async () => {
-    const url1 = utils.getRemoteUrl('HTTPS', 'peter-evans/create-pull-request')
+    const url1 = utils.getRemoteUrl(
+      'HTTPS',
+      'github.com',
+      'peter-evans/create-pull-request'
+    )
    expect(url1).toEqual('https://github.com/peter-evans/create-pull-request')

-    const url2 = utils.getRemoteUrl('SSH', 'peter-evans/create-pull-request')
+    const url2 = utils.getRemoteUrl(
+      'SSH',
+      'github.com',
+      'peter-evans/create-pull-request'
+    )
    expect(url2).toEqual('git@github.com:peter-evans/create-pull-request.git')
+
+    const url3 = utils.getRemoteUrl(
+      'HTTPS',
+      'mygithubserver.com',
+      'peter-evans/create-pull-request'
+    )
+    expect(url3).toEqual(
+      'https://mygithubserver.com/peter-evans/create-pull-request'
+    )
  })

  test('secondsSinceEpoch returns the number of seconds since the Epoch', async () => {
--- a/action.yml
+++ b/action.yml
@ -54,6 +54,8 @@ inputs:
  body:
    description: 'The body of the pull request.'
    default: 'Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action'
+  body-path:
+    description: 'The path to a file containing the pull request body. Takes precedence over `body`.'
  labels:
    description: 'A comma or newline separated list of labels.'
  assignees:
--- a/dist/index.js
+++ b/dist/index.js
--- a/docs/concepts-guidelines.md
+++ b/docs/concepts-guidelines.md
@ -88,7 +88,7 @@ In these cases, you *must supply* the `base` input so the action can rebase chan
 Workflows triggered by [`pull_request`](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#pull_request) events will by default check out a merge commit. Set the `base` input as follows to base the new pull request on the current pull request's branch.

 ```yml
-      - uses: peter-evans/create-pull-request@v4
+      - uses: peter-evans/create-pull-request@v5
        with:
          base: ${{ github.head_ref }}
 ```
@ -96,7 +96,7 @@ Workflows triggered by [`pull_request`](https://docs.github.com/en/actions/refer
 Workflows triggered by [`release`](https://docs.github.com/en/actions/reference/events-that-trigger-workflows#release) events will by default check out a tag. For most use cases, you will need to set the `base` input to the branch name of the tagged commit.

 ```yml
-      - uses: peter-evans/create-pull-request@v4
+      - uses: peter-evans/create-pull-request@v5
        with:
          base: main
 ```
@ -146,7 +146,7 @@ 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/reference/events-that-trigger-workflows#triggering-new-workflows-using-a-personal-access-token). However, the PAT cannot be scoped to a specific repository so the token becomes a very sensitive secret. If this is a concern, the PAT can instead be created for a dedicated [machine account](https://docs.github.com/en/github/site-policy/github-terms-of-service#3-account-requirements) that has collaborator access to the repository. Also note that because the account that owns the PAT will be the creator of pull requests, that user account will be unable to perform actions such as request changes or approve the pull request.
+- Use a `repo` scoped [Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/creating-a-personal-access-token) created on an account that has write access to the repository that pull requests are being created in. This is the standard workaround and [recommended by GitHub](https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). However, the PAT cannot be scoped to a specific repository so the token becomes a very sensitive secret. If this is a concern, the PAT can instead be created for a dedicated [machine account](https://docs.github.com/en/github/site-policy/github-terms-of-service#3-account-requirements) that has collaborator access to the repository. Also note that because the account that owns the PAT will be the creator of pull requests, that user account will be unable to perform actions such as request changes or approve the pull request.

 - Use [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.

@ -180,7 +180,7 @@ 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@v4
+      - uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.PAT }}
 ```
@ -207,15 +207,16 @@ 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@v4
+        uses: peter-evans/create-pull-request@v5
 ```

 ### Push pull request branches to a fork

 Instead of pushing pull request branches to the repository you want to update, you can push them to a fork of that repository.
 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 has no access to the main repository.
+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`.

 1. Create a new GitHub user and login.
 2. Fork the repository that you will be creating pull requests in.
@ -229,7 +230,7 @@ It will use their own fork to push code and create the pull request.

      # Make changes to pull request here

-      - uses: peter-evans/create-pull-request@v4
+      - uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.MACHINE_USER_PAT }}
          push-to-fork: machine-user/fork-of-repository
@ -272,7 +273,7 @@ GitHub App generated tokens are more secure than using a PAT because GitHub App
      # Make changes to pull request here

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ steps.generate-token.outputs.token }}
 ```
@ -313,7 +314,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@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.PAT }}
          committer: example <email@example.com>
@ -343,7 +344,7 @@ jobs:
      # Make changes to pull request here

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
 ```

 **Ubuntu container example:**
@ -366,5 +367,5 @@ jobs:
      # Make changes to pull request here

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
 ```
--- a/docs/examples.md
+++ b/docs/examples.md
@ -19,8 +19,8 @@
  - [autopep8](#autopep8)
 - [Misc workflow tips](#misc-workflow-tips)
  - [Filtering push events](#filtering-push-events)
+  - [Bypassing git hooks](#bypassing-git-hooks)
  - [Dynamic configuration using variables](#dynamic-configuration-using-variables)
-  - [Setting the pull request body from a file](#setting-the-pull-request-body-from-a-file)
  - [Using a markdown template](#using-a-markdown-template)
  - [Debugging GitHub Actions](#debugging-github-actions)

@ -50,7 +50,7 @@ jobs:
        run: |
          git log --format='%aN <%aE>%n%cN <%cE>' | sort -u > AUTHORS
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          commit-message: update authors
          title: Update AUTHORS
@ -82,7 +82,7 @@ jobs:
          git fetch origin main:main
          git reset --hard main
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          branch: production-promotion
 ```
@ -117,7 +117,7 @@ jobs:
          ./git-chglog -o CHANGELOG.md
          rm git-chglog
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          commit-message: update changelog
          title: Update Changelog
@ -154,7 +154,7 @@ jobs:
          npx -p npm-check-updates ncu -u
          npm install
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
            token: ${{ secrets.PAT }}
            commit-message: Update dependencies
@ -215,7 +215,7 @@ jobs:
      - name: Perform dependency resolution and write new lockfiles
        run: ./gradlew dependencies --write-locks
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
            token: ${{ secrets.PAT }}
            commit-message: Update dependencies
@ -250,7 +250,7 @@ jobs:
          cargo update
          cargo upgrade --to-lockfile
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
            token: ${{ secrets.PAT }}
            commit-message: Update dependencies
@ -282,8 +282,10 @@ jobs:
      - name: Get Latest Swagger UI Release
        id: swagger-ui
        run: |
-          echo ::set-output name=release_tag::$(curl -sL https://api.github.com/repos/swagger-api/swagger-ui/releases/latest | jq -r ".tag_name")
-          echo ::set-output name=current_tag::$(<swagger-ui.version)
+          release_tag=$(curl -sL https://api.github.com/repos/swagger-api/swagger-ui/releases/latest | jq -r ".tag_name")
+          echo "release_tag=$release_tag" >> $GITHUB_OUTPUT
+          current_tag=$(<swagger-ui.version)
+          echo "current_tag=$current_tag" >> $GITHUB_OUTPUT
      - name: Update Swagger UI
        if: steps.swagger-ui.outputs.current_tag != steps.swagger-ui.outputs.release_tag
        env:
@ -306,7 +308,7 @@ jobs:
          # Update current release
          echo ${{ steps.swagger-ui.outputs.release_tag }} > swagger-ui.version
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          commit-message: Update swagger-ui to ${{ steps.swagger-ui.outputs.release_tag }}
          title: Update SwaggerUI to ${{ steps.swagger-ui.outputs.release_tag }}
@ -350,7 +352,7 @@ jobs:
          git fetch upstream main:upstream-main
          git reset --hard upstream-main
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          token: ${{ secrets.PAT }}
          branch: upstream-changes
@ -383,7 +385,7 @@ jobs:
            --domains quotes.toscrape.com \
            http://quotes.toscrape.com/
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          commit-message: update local website copy
          title: Automated Updates to Local Website Copy
@ -475,10 +477,12 @@ jobs:
          args: --exit-code --recursive --in-place --aggressive --aggressive .
      - name: Set autopep8 branch name
        id: vars
-        run: echo ::set-output name=branch-name::"autopep8-patches/${{ github.head_ref }}"
+        run: |
+          branch-name="autopep8-patches/${{ github.head_ref }}"
+          echo "branch-name=$branch-name" >> $GITHUB_OUTPUT
      - name: Create Pull Request
        if: steps.autopep8.outputs.exit-code == 2
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          commit-message: autopep8 action fixes
          title: Fixes by autopep8 action
@ -522,46 +526,39 @@ jobs:
      ...
 ```

+### Bypassing git hooks
+
+If you have git hooks that prevent the action from working correctly you can remove them before running the action.
+
+```yml
+      # Remove git hooks
+      - run: rm -rf .git/hooks
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+```
+
 ### Dynamic configuration using variables

 The following examples show how configuration for the action can be dynamically defined in a previous workflow step.
-
-The recommended method is to use [`set-output`](https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-output-parameter). Note that the step where output variables are defined must have an id.
+Note that the step where output variables are defined must have an id.

 ```yml
      - name: Set output variables
        id: vars
        run: |
-          echo ::set-output name=pr_title::"[Test] Add report file $(date +%d-%m-%Y)"
-          echo ::set-output name=pr_body::"This PR was auto-generated on $(date +%d-%m-%Y) \
+          pr_title="[Test] Add report file $(date +%d-%m-%Y)"
+          pr_body="This PR was auto-generated on $(date +%d-%m-%Y) \
            by [create-pull-request](https://github.com/peter-evans/create-pull-request)."
+          echo "pr_title=$pr_title" >> $GITHUB_OUTPUT
+          echo "pr_body=$pr_body" >> $GITHUB_OUTPUT
      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          title: ${{ steps.vars.outputs.pr_title }}
          body: ${{ steps.vars.outputs.pr_body }}
 ```

-### Setting the pull request body from a file
-
-This example shows how file content can be read into a variable and passed to the action.
-The content must be [escaped to preserve newlines](https://github.community/t/set-output-truncates-multiline-strings/16852/3).
-
-```yml
-      - id: get-pr-body
-        run: |
-          body=$(cat pr-body.txt)
-          body="${body//'%'/'%25'}"
-          body="${body//$'\n'/'%0A'}"
-          body="${body//$'\r'/'%0D'}" 
-          echo ::set-output name=body::$body
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
-        with:
-          body: ${{ steps.get-pr-body.outputs.body }}
-```
-
 ### Using a markdown template

 In this example, a markdown template file is added to the repository at `.github/pull-request-template.md` with the following content.
@ -582,7 +579,7 @@ The template is rendered using the [render-template](https://github.com/chuhlomi
            bar: that

      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
        with:
          body: ${{ steps.template.outputs.result }}
 ```
--- a/docs/updating.md
+++ b/docs/updating.md
@ -1,6 +1,23 @@
+## Updating from `v4` to `v5`
+
+### Behaviour changes
+
+- The action will no longer leave the local repository checked out on the pull request `branch`. Instead, it will leave the repository checked out on the branch or commit that it was when the action started.
+- When using `add-paths`, uncommitted changes will no longer be destroyed. They will be stashed and restored at the end of the action run.
+
+### What's new
+
+- Adds input `body-path`, the path to a file containing the pull request body.
+- At the end of the action run the local repository is now checked out on the branch or commit that it was when the action started.
+- Any uncommitted tracked or untracked changes are now stashed and restored at the end of the action run. Currently, this can only occur when using the `add-paths` input, which allows for changes to not be committed. Previously, any uncommitted changes would be destroyed.
+- The proxy implementation has been revised but is not expected to have any change in behaviour. It continues to support the standard environment variables `http_proxy`, `https_proxy` and `no_proxy`.
+- Now sets the git `safe.directory` configuration for the local repository path. The configuration is removed when the action completes. Fixes issue https://github.com/peter-evans/create-pull-request/issues/1170.
+- Now determines the git directory path using the `git rev-parse --git-dir` command. This allows users with custom repository configurations to use the action.
+- Improved handling of the `team-reviewers` input and associated errors.
+
 ## Updating from `v3` to `v4`

-### Breaking changes
+### Behaviour changes

 - The `add-paths` input no longer accepts `-A` as a valid value. When committing all new and modified files the `add-paths` input should be omitted.

@ -14,7 +31,7 @@

 ## Updating from `v2` to `v3`

-### Breaking changes
+### Behaviour changes

 - The `author` input now defaults to the user who triggered the workflow run. This default is set via [action.yml](../action.yml) as `${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>`, where `github.actor` is the GitHub user account associated with the run. For example, `peter-evans <peter-evans@users.noreply.github.com>`.

@ -62,7 +79,7 @@

 ## Updating from `v1` to `v2`

-### Breaking changes
+### Behaviour changes

 - `v2` now expects repositories to be checked out with `actions/checkout@v2`

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "create-pull-request",
-  "version": "4.0.0",
+  "version": "5.0.0",
  "private": true,
  "description": "Creates a pull request for changes to your repository in the actions workspace",
  "main": "lib/main.js",
@ -29,30 +29,31 @@
  },
  "homepage": "https://github.com/peter-evans/create-pull-request",
  "dependencies": {
-    "@actions/core": "^1.6.0",
-    "@actions/exec": "^1.1.0",
-    "@octokit/core": "^3.5.1",
-    "@octokit/plugin-paginate-rest": "^2.17.0",
-    "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
-    "https-proxy-agent": "^5.0.0",
-    "uuid": "^8.3.2"
+    "@actions/core": "^1.10.0",
+    "@actions/exec": "^1.1.1",
+    "@octokit/core": "^4.2.0",
+    "@octokit/plugin-paginate-rest": "^5.0.1",
+    "@octokit/plugin-rest-endpoint-methods": "^6.8.1",
+    "https-proxy-agent": "^5.0.1",
+    "proxy-from-env": "^1.1.0",
+    "uuid": "^9.0.0"
  },
  "devDependencies": {
-    "@types/jest": "^27.5.0",
-    "@types/node": "^16.11.11",
-    "@typescript-eslint/parser": "^5.5.0",
-    "@vercel/ncc": "^0.32.0",
-    "eslint": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-github": "^4.3.5",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^26.1.5",
-    "jest": "^28.1.0",
-    "jest-circus": "^28.1.0",
-    "jest-environment-jsdom": "^28.1.0",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.15.11",
+    "@typescript-eslint/parser": "^5.57.1",
+    "@vercel/ncc": "^0.36.1",
+    "eslint": "^8.37.0",
+    "eslint-import-resolver-typescript": "^3.5.4",
+    "eslint-plugin-github": "^4.7.0",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-jest": "^27.2.1",
+    "jest": "^29.5.0",
+    "jest-circus": "^29.4.2",
+    "jest-environment-jsdom": "^29.5.0",
    "js-yaml": "^4.1.0",
-    "prettier": "^2.5.0",
-    "ts-jest": "^28.0.2",
-    "typescript": "^4.5.2"
+    "prettier": "^2.8.7",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.9.5"
  }
 }
--- a/src/create-or-update-branch.ts
+++ b/src/create-or-update-branch.ts
@ -43,17 +43,39 @@ export async function tryFetch(
  }
 }

+// Return the number of commits that branch2 is ahead of branch1
+async function commitsAhead(
+  git: GitCommandManager,
+  branch1: string,
+  branch2: string
+): Promise<number> {
+  const result = await git.revList(
+    [`${branch1}...${branch2}`],
+    ['--right-only', '--count']
+  )
+  return Number(result)
+}
+
 // Return true if branch2 is ahead of branch1
 async function isAhead(
  git: GitCommandManager,
  branch1: string,
  branch2: string
 ): Promise<boolean> {
+  return (await commitsAhead(git, branch1, branch2)) > 0
+}
+
+// Return the number of commits that branch2 is behind branch1
+async function commitsBehind(
+  git: GitCommandManager,
+  branch1: string,
+  branch2: string
+): Promise<number> {
  const result = await git.revList(
    [`${branch1}...${branch2}`],
-    ['--right-only', '--count']
+    ['--left-only', '--count']
  )
-  return Number(result) > 0
+  return Number(result)
 }

 // Return true if branch2 is behind branch1
@ -62,11 +84,7 @@ async function isBehind(
  branch1: string,
  branch2: string
 ): Promise<boolean> {
-  const result = await git.revList(
-    [`${branch1}...${branch2}`],
-    ['--left-only', '--count']
-  )
-  return Number(result) > 0
+  return (await commitsBehind(git, branch1, branch2)) > 0
 }

 // Return true if branch2 is even with branch1
@ -88,6 +106,13 @@ function splitLines(multilineString: string): string[] {
    .filter(x => x !== '')
 }

+interface CreateOrUpdateBranchResult {
+  action: string
+  base: string
+  hasDiffWithBase: boolean
+  headSha: string
+}
+
 export async function createOrUpdateBranch(
  git: GitCommandManager,
  commitMessage: string,
@ -145,9 +170,8 @@ export async function createOrUpdateBranch(
    }
  }

-  // Remove uncommitted tracked and untracked changes
-  await git.exec(['reset', '--hard'])
-  await git.exec(['clean', '-f', '-d'])
+  // Stash any uncommitted tracked and untracked changes
+  const stashed = await git.stashPush(['--include-untracked'])

  // Perform fetch and reset the working base
  // Commits made during the workflow will be removed
@ -226,10 +250,16 @@ export async function createOrUpdateBranch(
    //   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
+    //   temp branch. This catches a case where the base branch has been force pushed to
+    //   a new commit.
    // For changes on base this reset is equivalent to a rebase of the pull request branch.
+    const tempBranchCommitsAhead = await commitsAhead(git, base, tempBranch)
+    const branchCommitsAhead = await commitsAhead(git, base, branch)
    if (
      (await git.hasDiff([`${branch}..${tempBranch}`])) ||
-      !(await isAhead(git, base, tempBranch))
+      branchCommitsAhead != tempBranchCommitsAhead ||
+      !(tempBranchCommitsAhead > 0) // !isAhead
    ) {
      core.info(`Resetting '${branch}'`)
      // Alternatively, git switch -C branch tempBranch
@ -259,12 +289,13 @@ export async function createOrUpdateBranch(
  // Delete the temporary branch
  await git.exec(['branch', '--delete', '--force', tempBranch])

+  // Checkout the working base to leave the local repository as it was found
+  await git.checkout(workingBase)
+
+  // Restore any stashed changes
+  if (stashed) {
+    await git.stashPop()
+  }
+
  return result
 }
-
-interface CreateOrUpdateBranchResult {
-  action: string
-  base: string
-  hasDiffWithBase: boolean
-  headSha: string
-}
--- a/src/create-pull-request.ts
+++ b/src/create-pull-request.ts
@ -24,6 +24,7 @@ export interface Inputs {
  pushToFork: string
  title: string
  body: string
+  bodyPath: string
  labels: string[]
  assignees: string[]
  reviewers: string[]
@ -35,14 +36,26 @@ export interface Inputs {
 export async function createPullRequest(inputs: Inputs): Promise<void> {
  let gitAuthHelper
  try {
+    if (!inputs.token) {
+      throw new Error(`Input 'token' not supplied. Unable to continue.`)
+    }
+    if (inputs.bodyPath) {
+      if (!utils.fileExistsSync(inputs.bodyPath)) {
+        throw new Error(`File '${inputs.bodyPath}' does not exist.`)
+      }
+      // Update the body input with the contents of the file
+      inputs.body = utils.readFile(inputs.bodyPath)
+    }
+
    // Get the repository path
    const repoPath = utils.getRepoPath(inputs.path)
    // Create a git command manager
    const git = await GitCommandManager.create(repoPath)

    // Save and unset the extraheader auth config if it exists
-    core.startGroup('Save persisted git credentials')
+    core.startGroup('Prepare git configuration')
    gitAuthHelper = new GitAuthHelper(git)
+    await gitAuthHelper.addSafeDirectory()
    await gitAuthHelper.savePersistedAuth()
    core.endGroup()

@ -60,6 +73,9 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
      : baseRemote.repository
    if (inputs.pushToFork) {
      // Check if the supplied fork is really a fork of the base
+      core.info(
+        `Checking if '${branchRepository}' is a fork of '${baseRemote.repository}'`
+      )
      const parentRepository = await githubHelper.getRepositoryParent(
        branchRepository
      )
@ -71,6 +87,7 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
      // Add a remote for the fork
      const remoteUrl = utils.getRemoteUrl(
        baseRemote.protocol,
+        baseRemote.hostname,
        branchRepository
      )
      await git.exec(['remote', 'add', 'fork', remoteUrl])
@ -187,7 +204,7 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
      await git.push([
        '--force-with-lease',
        branchRemoteName,
-        `HEAD:refs/heads/${inputs.branch}`
+        `${inputs.branch}:refs/heads/${inputs.branch}`
      ])
      core.endGroup()
    }
@ -240,13 +257,14 @@ export async function createPullRequest(inputs: Inputs): Promise<void> {
        }
      }
    }
-  } catch (error: any) {
-    core.setFailed(error.message)
+  } catch (error) {
+    core.setFailed(utils.getErrorMessage(error))
  } finally {
    // Remove auth and restore persisted auth config if it existed
-    core.startGroup('Restore persisted git credentials')
+    core.startGroup('Restore git configuration')
    await gitAuthHelper.removeAuth()
    await gitAuthHelper.restorePersistedAuth()
+    await gitAuthHelper.removeSafeDirectory()
    core.endGroup()
  }
 }
--- a/src/git-auth-helper.ts
+++ b/src/git-auth-helper.ts
@ -3,10 +3,14 @@ import * as fs from 'fs'
 import {GitCommandManager} from './git-command-manager'
 import * as path from 'path'
 import {URL} from 'url'
+import * as utils from './utils'

 export class GitAuthHelper {
  private git: GitCommandManager
-  private gitConfigPath: string
+  private gitConfigPath = ''
+  private workingDirectory: string
+  private safeDirectoryConfigKey = 'safe.directory'
+  private safeDirectoryAdded = false
  private extraheaderConfigKey: string
  private extraheaderConfigPlaceholderValue = 'AUTHORIZATION: basic ***'
  private extraheaderConfigValueRegex = '^AUTHORIZATION:'
@ -14,15 +18,38 @@ export class GitAuthHelper {

  constructor(git: GitCommandManager) {
    this.git = git
-    this.gitConfigPath = path.join(
-      this.git.getWorkingDirectory(),
-      '.git',
-      'config'
-    )
+    this.workingDirectory = this.git.getWorkingDirectory()
    const serverUrl = this.getServerUrl()
    this.extraheaderConfigKey = `http.${serverUrl.origin}/.extraheader`
  }

+  async addSafeDirectory(): Promise<void> {
+    const exists = await this.git.configExists(
+      this.safeDirectoryConfigKey,
+      this.workingDirectory,
+      true
+    )
+    if (!exists) {
+      await this.git.config(
+        this.safeDirectoryConfigKey,
+        this.workingDirectory,
+        true,
+        true
+      )
+      this.safeDirectoryAdded = true
+    }
+  }
+
+  async removeSafeDirectory(): Promise<void> {
+    if (this.safeDirectoryAdded) {
+      await this.git.tryConfigUnset(
+        this.safeDirectoryConfigKey,
+        this.workingDirectory,
+        true
+      )
+    }
+  }
+
  async savePersistedAuth(): Promise<void> {
    // Save and unset persisted extraheader credential in git config if it exists
    this.persistedExtraheaderConfigValue = await this.getAndUnset()
@ -33,8 +60,8 @@ export class GitAuthHelper {
      try {
        await this.setExtraheaderConfig(this.persistedExtraheaderConfigValue)
        core.info('Persisted git credentials restored')
-      } catch (e: any) {
-        core.warning(e)
+      } catch (e) {
+        core.warning(utils.getErrorMessage(e))
      }
    }
  }
@ -105,6 +132,10 @@ export class GitAuthHelper {
    find: string,
    replace: string
  ): Promise<void> {
+    if (this.gitConfigPath.length === 0) {
+      const gitDir = await this.git.getGitDirectory()
+      this.gitConfigPath = path.join(this.workingDirectory, gitDir, 'config')
+    }
    let content = (await fs.promises.readFile(this.gitConfigPath)).toString()
    const index = content.indexOf(find)
    if (index < 0 || index != content.lastIndexOf(find)) {
@ -115,12 +146,6 @@ export class GitAuthHelper {
  }

  private getServerUrl(): URL {
-    // todo: remove GITHUB_URL after support for GHES Alpha is no longer needed
-    // See https://github.com/actions/checkout/blob/main/src/url-helper.ts#L22-L29
-    return new URL(
-      process.env['GITHUB_SERVER_URL'] ||
-        process.env['GITHUB_URL'] ||
-        'https://github.com'
-    )
+    return new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com')
  }
 }
--- a/src/git-command-manager.ts
+++ b/src/git-command-manager.ts
@ -72,14 +72,15 @@ export class GitCommandManager {
  async config(
    configKey: string,
    configValue: string,
-    globalConfig?: boolean
+    globalConfig?: boolean,
+    add?: boolean
  ): Promise<void> {
-    await this.exec([
-      'config',
-      globalConfig ? '--global' : '--local',
-      configKey,
-      configValue
-    ])
+    const args: string[] = ['config', globalConfig ? '--global' : '--local']
+    if (add) {
+      args.push('--add')
+    }
+    args.push(...[configKey, configValue])
+    await this.exec(args)
  }

  async configExists(
@ -145,6 +146,10 @@ export class GitCommandManager {
    return output.stdout.trim().split(`${configKey} `)[1]
  }

+  getGitDirectory(): Promise<string> {
+    return this.revParse('--git-dir')
+  }
+
  getWorkingDirectory(): string {
    return this.workingDirectory
  }
@ -210,6 +215,23 @@ export class GitCommandManager {
    return output.stdout.trim()
  }

+  async stashPush(options?: string[]): Promise<boolean> {
+    const args = ['stash', 'push']
+    if (options) {
+      args.push(...options)
+    }
+    const output = await this.exec(args)
+    return output.stdout.trim() !== 'No local changes to save'
+  }
+
+  async stashPop(options?: string[]): Promise<void> {
+    const args = ['stash', 'pop']
+    if (options) {
+      args.push(...options)
+    }
+    await this.exec(args)
+  }
+
  async status(options?: string[]): Promise<string> {
    const args = ['status']
    if (options) {
--- a/src/github-helper.ts
+++ b/src/github-helper.ts
@ -1,9 +1,10 @@
 import * as core from '@actions/core'
 import {Inputs} from './create-pull-request'
 import {Octokit, OctokitOptions} from './octokit-client'
+import * as utils from './utils'

-const ERROR_PR_REVIEW_FROM_AUTHOR =
-  'Review cannot be requested from pull request author'
+const ERROR_PR_REVIEW_TOKEN_SCOPE =
+  'Validation Failed: "Could not resolve to a node with the global id of'

 interface Repository {
  owner: string
@ -64,10 +65,9 @@ export class GitHubHelper {
        html_url: pull.html_url,
        created: true
      }
-    } catch (e: any) {
+    } catch (e) {
      if (
-        e.message &&
-        e.message.includes(`A pull request already exists for`)
+        utils.getErrorMessage(e).includes(`A pull request already exists for`)
      ) {
        core.info(`A pull request already exists for ${headBranch}`)
      } else {
@ -159,8 +159,9 @@ export class GitHubHelper {
      core.info(`Requesting reviewers '${inputs.reviewers}'`)
    }
    if (inputs.teamReviewers.length > 0) {
-      requestReviewersParams['team_reviewers'] = inputs.teamReviewers
-      core.info(`Requesting team reviewers '${inputs.teamReviewers}'`)
+      const teams = utils.stripOrgPrefixFromTeams(inputs.teamReviewers)
+      requestReviewersParams['team_reviewers'] = teams
+      core.info(`Requesting team reviewers '${teams}'`)
    }
    if (Object.keys(requestReviewersParams).length > 0) {
      try {
@ -169,12 +170,13 @@ export class GitHubHelper {
          pull_number: pull.number,
          ...requestReviewersParams
        })
-      } catch (e: any) {
-        if (e.message && e.message.includes(ERROR_PR_REVIEW_FROM_AUTHOR)) {
-          core.warning(ERROR_PR_REVIEW_FROM_AUTHOR)
-        } else {
-          throw e
+      } catch (e) {
+        if (utils.getErrorMessage(e).includes(ERROR_PR_REVIEW_TOKEN_SCOPE)) {
+          core.error(
+            `Unable to request reviewers. If requesting team reviewers a 'repo' scoped PAT is required.`
+          )
        }
+        throw e
      }
    }

--- a/src/main.ts
+++ b/src/main.ts
@ -20,6 +20,7 @@ async function run(): Promise<void> {
      pushToFork: core.getInput('push-to-fork'),
      title: core.getInput('title'),
      body: core.getInput('body'),
+      bodyPath: core.getInput('body-path'),
      labels: utils.getInputAsArray('labels'),
      assignees: utils.getInputAsArray('assignees'),
      reviewers: utils.getInputAsArray('reviewers'),
@ -30,8 +31,8 @@ async function run(): Promise<void> {
    core.debug(`Inputs: ${inspect(inputs)}`)

    await createPullRequest(inputs)
-  } catch (error: any) {
-    core.setFailed(error.message)
+  } catch (error) {
+    core.setFailed(utils.getErrorMessage(error))
  }
 }

--- a/src/octokit-client.ts
+++ b/src/octokit-client.ts
@ -2,6 +2,7 @@ import {Octokit as Core} from '@octokit/core'
 import {paginateRest} from '@octokit/plugin-paginate-rest'
 import {restEndpointMethods} from '@octokit/plugin-rest-endpoint-methods'
 import {HttpsProxyAgent} from 'https-proxy-agent'
+import {getProxyForUrl} from 'proxy-from-env'
 export {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods'
 export {OctokitOptions} from '@octokit/core/dist-types/types'

@ -11,23 +12,12 @@ export const Octokit = Core.plugin(
  autoProxyAgent
 )

-// Octokit plugin to support the https_proxy and no_proxy environment variable
+// Octokit plugin to support the standard environment variables http_proxy, https_proxy and no_proxy
 function autoProxyAgent(octokit: Core) {
-  const proxy = process.env.https_proxy || process.env.HTTPS_PROXY
-
-  const noProxy = process.env.no_proxy || process.env.NO_PROXY
-  let noProxyArray: string[] = []
-  if (noProxy) {
-    noProxyArray = noProxy.split(',')
-  }
-
-  if (!proxy) return
-
-  const agent = new HttpsProxyAgent(proxy)
  octokit.hook.before('request', options => {
-    if (noProxyArray.includes(options.request.hostname)) {
-      return
+    const proxy = getProxyForUrl(options.baseUrl)
+    if (proxy) {
+      options.request.agent = new HttpsProxyAgent(proxy)
    }
-    options.request.agent = agent
  })
 }
--- a/src/utils.ts
+++ b/src/utils.ts
@ -16,6 +16,16 @@ export function getStringAsArray(str: string): string[] {
    .filter(x => x !== '')
 }

+export function stripOrgPrefixFromTeams(teams: string[]): string[] {
+  return teams.map(team => {
+    const slashIndex = team.lastIndexOf('/')
+    if (slashIndex > 0) {
+      return team.substring(slashIndex + 1)
+    }
+    return team
+  })
+}
+
 export function getRepoPath(relativePath?: string): string {
  let githubWorkspacePath = process.env['GITHUB_WORKSPACE']
  if (!githubWorkspacePath) {
@ -32,6 +42,7 @@ export function getRepoPath(relativePath?: string): string {
 }

 interface RemoteDetail {
+  hostname: string
  protocol: string
  repository: string
 }
@ -46,18 +57,18 @@ export function getRemoteDetail(remoteUrl: string): RemoteDetail {
    throw new Error('Could not parse GitHub Server name')
  }

+  const hostname = githubServerMatch[1]
+
  const httpsUrlPattern = new RegExp(
-    '^https?://.*@?' + githubServerMatch[1] + '/(.+/.+?)(.git)?$',
-    'i'
-  )
-  const sshUrlPattern = new RegExp(
-    '^git@' + githubServerMatch[1] + ':(.+/.+).git$',
+    '^https?://.*@?' + hostname + '/(.+/.+?)(\\.git)?$',
    'i'
  )
+  const sshUrlPattern = new RegExp('^git@' + hostname + ':(.+/.+)\\.git$', 'i')

  const httpsMatch = remoteUrl.match(httpsUrlPattern)
  if (httpsMatch) {
    return {
+      hostname,
      protocol: 'HTTPS',
      repository: httpsMatch[1]
    }
@ -66,6 +77,7 @@ export function getRemoteDetail(remoteUrl: string): RemoteDetail {
  const sshMatch = remoteUrl.match(sshUrlPattern)
  if (sshMatch) {
    return {
+      hostname,
      protocol: 'SSH',
      repository: sshMatch[1]
    }
@ -76,10 +88,14 @@ export function getRemoteDetail(remoteUrl: string): RemoteDetail {
  )
 }

-export function getRemoteUrl(protocol: string, repository: string): string {
+export function getRemoteUrl(
+  protocol: string,
+  hostname: string,
+  repository: string
+): string {
  return protocol == 'HTTPS'
-    ? `https://github.com/${repository}`
-    : `git@github.com:${repository}.git`
+    ? `https://${hostname}/${repository}`
+    : `git@${hostname}:${repository}.git`
 }

 export function secondsSinceEpoch(): number {
@ -134,13 +150,15 @@ export function fileExistsSync(path: string): boolean {
  let stats: fs.Stats
  try {
    stats = fs.statSync(path)
-  } catch (error: any) {
-    if (error.code === 'ENOENT') {
+  } catch (error) {
+    if (hasErrorCode(error) && error.code === 'ENOENT') {
      return false
    }

    throw new Error(
-      `Encountered an error when checking whether path '${path}' exists: ${error.message}`
+      `Encountered an error when checking whether path '${path}' exists: ${getErrorMessage(
+        error
+      )}`
    )
  }

@ -150,3 +168,17 @@ export function fileExistsSync(path: string): boolean {

  return false
 }
+
+export function readFile(path: string): string {
+  return fs.readFileSync(path, 'utf-8')
+}
+
+/* eslint-disable  @typescript-eslint/no-explicit-any */
+function hasErrorCode(error: any): error is {code: string} {
+  return typeof (error && error.code) === 'string'
+}
+
+export function getErrorMessage(error: unknown) {
+  if (error instanceof Error) return error.message
+  return String(error)
+}