Merge pull request #792 from tj-actions/chore/update-readme

Updated README.md

.github/workflows/test.yml

@@ -127,9 +127,9 @@ jobs:
           until: "2022-08-20"
 
       - name: Check output
-        if: "!contains(steps.changed-files-until.outputs.all_changed_files, 'entrypoint.sh')"
+        if: "!contains(steps.changed-files-until.outputs.all_changed_files, 'README.md')"
         run: |
-          echo "Invalid output: Expected to include (entrypoint.sh) got (${{ steps.changed-files-until.outputs.all_changed_files }})"
+          echo "Invalid output: Expected to include (README.md) got (${{ steps.changed-files-until.outputs.all_changed_files }})"
           exit 1
         shell:
           bash
@@ -361,6 +361,16 @@ jobs:
           echo '${{ toJSON(steps.changed-files.outputs) }}'
         shell:
           bash
+      - name: Run changed-files with since_last_remote_commit
+        id: changed-files-since-last-remote-commit
+        uses: ./
+        with:
+          since_last_remote_commit: true
+      - name: Show output
+        run: |
+          echo '${{ toJSON(steps.changed-files-since-last-remote-commit.outputs) }}'
+        shell:
+          bash
       - name: Run changed-files with include_all_old_new_renamed_files
         id: changed-files-all-old-new-renamed-files
         uses: ./
@@ -899,7 +909,7 @@ jobs:
           bash
       - name: Run changed-files with custom sha
         id: changed-files-custom-sha
-        if: github.event.action != 'closed'
+        if: github.event_name == 'pull_request' && github.event.action != 'closed'
         uses: ./
         with:
           sha: ${{ github.event.pull_request.head.sha }}

HISTORY.md

@@ -1,12 +1,80 @@
 # Changelog
 
+## [v34.3.3](https://github.com/tj-actions/changed-files/tree/v34.3.3) (2022-11-08)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34...v34.3.3)
+
+## [v34](https://github.com/tj-actions/changed-files/tree/v34) (2022-11-08)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.1...v34)
+
+**Fixed bugs:**
+
+- \[BUG\] Action compares only two latest commits on push [\#783](https://github.com/tj-actions/changed-files/issues/783)
+- Detected dubious ownership in repository error when running the action [\#782](https://github.com/tj-actions/changed-files/issues/782)
+
+**Closed issues:**
+
+- Dependency Dashboard [\#27](https://github.com/tj-actions/changed-files/issues/27)
+
+**Merged pull requests:**
+
+- fix: bug with force pushing commits to pr branches [\#787](https://github.com/tj-actions/changed-files/pull/787) ([jackton1](https://github.com/jackton1))
+- fix: bug with invalid branch name [\#786](https://github.com/tj-actions/changed-files/pull/786) ([jackton1](https://github.com/jackton1))
+- chore\(deps\): update tj-actions/glob action to v16 [\#785](https://github.com/tj-actions/changed-files/pull/785) ([renovate[bot]](https://github.com/apps/renovate))
+- chore: update readme [\#784](https://github.com/tj-actions/changed-files/pull/784) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.3.2 [\#781](https://github.com/tj-actions/changed-files/pull/781) ([jackton1](https://github.com/jackton1))
+
+## [v34.3.1](https://github.com/tj-actions/changed-files/tree/v34.3.1) (2022-11-07)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.2...v34.3.1)
+
+## [v34.3.2](https://github.com/tj-actions/changed-files/tree/v34.3.2) (2022-11-07)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.0...v34.3.2)
+
+**Fixed bugs:**
+
+- \[BUG\] Similar commit hashes detected: previous sha: abc123 is equivalent to the current sha: abc123 on PR merge [\#778](https://github.com/tj-actions/changed-files/issues/778)
+
+**Merged pull requests:**
+
+- fix: similar commit hashes [\#780](https://github.com/tj-actions/changed-files/pull/780) ([jackton1](https://github.com/jackton1))
+- chore: update readme [\#779](https://github.com/tj-actions/changed-files/pull/779) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.3.0 [\#777](https://github.com/tj-actions/changed-files/pull/777) ([jackton1](https://github.com/jackton1))
+
+## [v34.3.0](https://github.com/tj-actions/changed-files/tree/v34.3.0) (2022-11-07)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.2.2...v34.3.0)
+
+**Closed issues:**
+
+- How can I let the workflow to detect the changes only in the certain micro service? [\#766](https://github.com/tj-actions/changed-files/issues/766)
+
+**Merged pull requests:**
+
+- chore: exclude fetching tags [\#776](https://github.com/tj-actions/changed-files/pull/776) ([jackton1](https://github.com/jackton1))
+- chore: update test [\#775](https://github.com/tj-actions/changed-files/pull/775) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#774](https://github.com/tj-actions/changed-files/pull/774) ([jackton1](https://github.com/jackton1))
+- feat: add support for using the last remote commit [\#773](https://github.com/tj-actions/changed-files/pull/773) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.2.2 [\#772](https://github.com/tj-actions/changed-files/pull/772) ([jackton1](https://github.com/jackton1))
+
+## [v34.2.2](https://github.com/tj-actions/changed-files/tree/v34.2.2) (2022-11-06)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.2.1...v34.2.2)
+
+**Merged pull requests:**
+
+- Updated README.md [\#771](https://github.com/tj-actions/changed-files/pull/771) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#770](https://github.com/tj-actions/changed-files/pull/770) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#769](https://github.com/tj-actions/changed-files/pull/769) ([jackton1](https://github.com/jackton1))
+- docs: add kenji-miyake as a contributor for code [\#768](https://github.com/tj-actions/changed-files/pull/768) ([allcontributors[bot]](https://github.com/apps/allcontributors))
+- chore: change `sha` to non-required [\#767](https://github.com/tj-actions/changed-files/pull/767) ([kenji-miyake](https://github.com/kenji-miyake))
+- Upgraded to v34.2.1 [\#765](https://github.com/tj-actions/changed-files/pull/765) ([jackton1](https://github.com/jackton1))
+
 ## [v34.2.1](https://github.com/tj-actions/changed-files/tree/v34.2.1) (2022-11-05)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34...v34.2.1)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.2.0...v34.2.1)
-
-## [v34](https://github.com/tj-actions/changed-files/tree/v34) (2022-11-05)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.2.0...v34)
 
 **Merged pull requests:**
 
@@ -124,10 +192,6 @@
 
 - \[BUG\] Auto-Merge not working properly on Change-Detection for PRs [\#713](https://github.com/tj-actions/changed-files/issues/713)
 
-**Closed issues:**
-
-- Dependency Dashboard [\#27](https://github.com/tj-actions/changed-files/issues/27)
-
 **Merged pull requests:**
 
 - Updated README.md [\#725](https://github.com/tj-actions/changed-files/pull/725) ([jackton1](https://github.com/jackton1))
@@ -1202,7 +1266,7 @@
 
 ## [v13](https://github.com/tj-actions/changed-files/tree/v13) (2022-02-17)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v2.0.1...v13)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.2...v13)
 
 **Implemented enhancements:**
 
@@ -1221,13 +1285,13 @@
 - \[BUG\] wrong result of any\_change output [\#314](https://github.com/tj-actions/changed-files/issues/314)
 - \[BUG\] Investigate possible bug using since\_last\_remote\_commit when force pushing changes. [\#303](https://github.com/tj-actions/changed-files/issues/303)
 
-## [v2.0.1](https://github.com/tj-actions/changed-files/tree/v2.0.1) (2021-12-30)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.2...v2.0.1)
-
 ## [v12.2](https://github.com/tj-actions/changed-files/tree/v12.2) (2021-12-30)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.1...v12.2)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v2.0.1...v12.2)
+
+## [v2.0.1](https://github.com/tj-actions/changed-files/tree/v2.0.1) (2021-12-30)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.1...v2.0.1)
 
 **Merged pull requests:**
 
@@ -1786,7 +1850,7 @@
 
 ## [v7](https://github.com/tj-actions/changed-files/tree/v7) (2021-06-09)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.3...v7)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6...v7)
 
 **Closed issues:**
 
@@ -1802,13 +1866,13 @@
 - Update tj-actions/sync-release-version action to v8.7 [\#86](https://github.com/tj-actions/changed-files/pull/86) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v6.3 [\#85](https://github.com/tj-actions/changed-files/pull/85) ([jackton1](https://github.com/jackton1))
 
-## [v6.3](https://github.com/tj-actions/changed-files/tree/v6.3) (2021-05-26)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6...v6.3)
-
 ## [v6](https://github.com/tj-actions/changed-files/tree/v6) (2021-05-26)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.2...v6)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.3...v6)
+
+## [v6.3](https://github.com/tj-actions/changed-files/tree/v6.3) (2021-05-26)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.2...v6.3)
 
 **Merged pull requests:**
 

README.md

@@ -52,9 +52,13 @@ Retrieve all changed files and directories relative to the target branch or the
 name: CI
 
 on:
+  # Compare the preceeding commit of main -> to the current commit of the main branch.
+  # (Note: To compare changes between the last pushed commit to the remote main branch set `since_last_remote_commit: true`)
   push:
     branches:
       - main
+  # Compare the last commit of main -> to the current commit of a PR branch. 
+  # (Note: To compare changes between the last pushed commit to the remote PR branch set `since_last_remote_commit: true`)
   pull_request:
     branches:
       - main
@@ -153,28 +157,30 @@ Support this project with a :star:
 
 <!-- AUTO-DOC-INPUT:START - Do not remove or modify this section -->
 
-|               INPUT               |  TYPE  | REQUIRED |        DEFAULT        |                                                                                            DESCRIPTION                                                                                             |
+|               INPUT               |  TYPE  | REQUIRED |        DEFAULT        |                                                                                                            DESCRIPTION                                                                                                             |
-|-----------------------------------|--------|----------|-----------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-----------------------------------|--------|----------|-----------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|             base\_sha              | string |  false   |                       |                                                               Specify a different base commit<br>SHA used for comparing changes<br>                                                                |
+|             base\_sha              | string |  false   |                       |                                                                               Specify a different base commit<br>SHA used for comparing changes<br>                                                                                |
-|           diff\_relative           | string |  false   |                       |        Exclude changes outside the current<br>directory and show pathnames relative<br>to it. **NOTE:** This requires<br>you to specify the top<br>level directory via the `path`<br>input.        |
+|           diff\_relative           | string |  false   |                       |                        Exclude changes outside the current<br>directory and show pathnames relative<br>to it. **NOTE:** This requires<br>you to specify the top<br>level directory via the `path`<br>input.                        |
-|             dir\_names             | string |  false   |       `"false"`       |                        Output unique changed directories instead<br>of filenames. **NOTE:** This returns<br>`.` for changed files located<br>in the root of the<br>project.                        |
+|             dir\_names             | string |  false   |       `"false"`       |                                        Output unique changed directories instead<br>of filenames. **NOTE:** This returns<br>`.` for changed files located<br>in the root of the<br>project.                                        |
-|            fetch\_depth            | string |  false   |        `"40"`         |                                  Limit depth of the branch<br>history fetched. **NOTE**: This can<br>be adjusted to resolve errors<br>with insufficient history.                                   |
+|            fetch\_depth            | string |  false   |        `"40"`         |                                                  Limit depth of the branch<br>history fetched. **NOTE**: This can<br>be adjusted to resolve errors<br>with insufficient history.                                                   |
-|               files               | string |  false   |                       | File and directory patterns to<br>detect changes using only these<br>list of file(s) (Defaults to<br>the entire repo) **NOTE:** Multiline<br>file/directory patterns should not include<br>qoutes. |
+|               files               | string |  false   |                       |                 File and directory patterns to<br>detect changes using only these<br>list of file(s) (Defaults to<br>the entire repo) **NOTE:** Multiline<br>file/directory patterns should not include<br>qoutes.                 |
-|      files\_from\_source\_file       | string |  false   |                       |                                                                       Source file(s) used to populate<br>the `files` input.                                                                        |
+|      files\_from\_source\_file       | string |  false   |                       |                                                                                       Source file(s) used to populate<br>the `files` input.                                                                                        |
-|           files\_ignore            | string |  false   |                       |                                            Ignore changes to these file(s)<br>**NOTE:** Multiline file/directory patterns should<br>not include qoutes.                                            |
+|           files\_ignore            | string |  false   |                       |                                                            Ignore changes to these file(s)<br>**NOTE:** Multiline file/directory patterns should<br>not include qoutes.                                                            |
-|   files\_ignore\_from\_source\_file   | string |  false   |                       |                                                                    Source file(s) used to populate<br>the `files_ignore` input                                                                     |
+|   files\_ignore\_from\_source\_file   | string |  false   |                       |                                                                                    Source file(s) used to populate<br>the `files_ignore` input                                                                                     |
-|      files\_ignore\_separator       | string |  false   |        `"\n"`         |                                                                        Separator used to split the<br>`files-ignore` input                                                                         |
+|      files\_ignore\_separator       | string |  false   |        `"\n"`         |                                                                                        Separator used to split the<br>`files-ignore` input                                                                                         |
-|          files\_separator          | string |  false   |        `"\n"`         |                                                                            Separator used to split the<br>`files` input                                                                            |
+|          files\_separator          | string |  false   |        `"\n"`         |                                                                                            Separator used to split the<br>`files` input                                                                                            |
-| include\_all\_old\_new\_renamed\_files | string |  false   |       `"false"`       |                    Include `all_old_new_renamed_files` output. Note this<br>can generate a large output<br>See: [#501](https://github.com/tj-actions/changed-files/issues/501).                    |
+| include\_all\_old\_new\_renamed\_files | string |  false   |       `"false"`       |                                    Include `all_old_new_renamed_files` output. Note this<br>can generate a large output<br>See: [#501](https://github.com/tj-actions/changed-files/issues/501).                                    |
-|               json                | string |  false   |       `"false"`       |                                                Output list of changed files<br>in a JSON formatted string<br>which can be used for<br>matrix jobs.                                                 |
+|               json                | string |  false   |       `"false"`       |                                                                Output list of changed files<br>in a JSON formatted string<br>which can be used for<br>matrix jobs.                                                                 |
-|      old\_new\_files\_separator      | string |  false   |         `" "`         |                                                                    Split character for multiple old<br>and new filename pairs.                                                                     |
+|          max\_fetch\_depth          | string |  false   |       `"5000"`        |                                                 Maximum depth of the branch<br>history fetched. **NOTE**: This can<br>be adjusted to resolve errors<br>with insufficient history.                                                  |
-|         old\_new\_separator         | string |  false   |         `","`         |                                                                         Split character for old and<br>new filename pairs.                                                                         |
+|      old\_new\_files\_separator      | string |  false   |         `" "`         |                                                                                    Split character for multiple old<br>and new filename pairs.                                                                                     |
-|               path                | string |  false   |         `"."`         |                                                         Specify a relative path under<br>`$GITHUB_WORKSPACE` to locate the repository.<br>                                                         |
+|         old\_new\_separator         | string |  false   |         `","`         |                                                                                         Split character for old and<br>new filename pairs.                                                                                         |
-|             quotepath             | string |  false   |       `"true"`        |                                      Use non ascii characters to<br>match files and output the<br>filenames completely verbatim by setting<br>this to `false`                                      |
+|               path                | string |  false   |         `"."`         |                                                                         Specify a relative path under<br>`$GITHUB_WORKSPACE` to locate the repository.<br>                                                                         |
-|             separator             | string |  false   |         `" "`         |                                                                               Split character for output strings<br>                                                                               |
+|             quotepath             | string |  false   |       `"true"`        |                                                      Use non ascii characters to<br>match files and output the<br>filenames completely verbatim by setting<br>this to `false`                                                      |
-|                sha                | string |  false   | `"${{ github.sha }}"` |                                                                    Specify a different commit SHA<br>used for comparing changes                                                                    |
+|             separator             | string |  false   |         `" "`         |                                                                                               Split character for output strings<br>                                                                                               |
-|               since               | string |  false   |                       |                                                         Get changed files for commits<br>whose timestamp is older than<br>the given time.                                                          |
+|                sha                | string |  false   | `"${{ github.sha }}"` |                                                                                    Specify a different commit SHA<br>used for comparing changes                                                                                    |
-|               until               | string |  false   |                       |                                                        Get changed files for commits<br>whose timestamp is earlier than<br>the given time.                                                         |
+|               since               | string |  false   |                       |                                                                         Get changed files for commits<br>whose timestamp is older than<br>the given time.                                                                          |
+|     since\_last\_remote\_commit      | string |   true   |       `"false"`       | Use the last commit on<br>the remote branch as the<br>`base_sha`. Defaults to the last<br>non merge commit on the<br>target branch for pull request<br>events and the previous commit<br>of the current branch for<br>push events. |
+|               until               | string |  false   |                       |                                                                        Get changed files for commits<br>whose timestamp is earlier than<br>the given time.                                                                         |
 
 <!-- AUTO-DOC-INPUT:END -->
 
@@ -594,6 +600,7 @@ This package was created with [Cookiecutter](https://github.com/cookiecutter/coo
 *   [tj-actions/glob](https://github.com/tj-actions/glob)
 *   [tj-actions/demo](https://github.com/tj-actions/demo)
 *   [tj-actions/demo2](https://github.com/tj-actions/demo2)
+*   [tj-actions/demo3](https://github.com/tj-actions/demo3)
 *   [tj-actions/release-tagger](https://github.com/tj-actions/release-tagger)
 *   [tj-actions/auto-doc](https://github.com/tj-actions/auto-doc)
 *   [tj-actions/verify-changed-files](https://github.com/tj-actions/verify-changed-files)

action.yml

@@ -81,6 +81,14 @@ inputs:
     description: "Limit depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
     required: false
     default: "40"
+  max_fetch_depth:
+    description: "Maximum depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
+    required: false
+    default: "5000"
+  since_last_remote_commit:
+    description: "Use the last commit on the remote branch as the `base_sha`. Defaults to the last non merge commit on the target branch for pull request events and the previous commit of the current branch for push events."
+    required: true
+    default: "false"
 
 outputs:
   added_files:
@@ -173,8 +181,10 @@ runs:
         INPUT_UNTIL: ${{ inputs.until }}
         INPUT_PATH: ${{ inputs.path }}
         INPUT_FETCH_DEPTH: ${{ inputs.fetch_depth }}
+        INPUT_MAX_FETCH_DEPTH: ${{ inputs.max_fetch_depth }}
+        INPUT_SINCE_LAST_REMOTE_COMMIT: ${{ inputs.since_last_remote_commit }}
     - name: Glob match
-      uses: tj-actions/glob@v15
+      uses: tj-actions/glob@v16
       id: glob
       with:
         files: ${{ inputs.files }}

diff-sha.sh

@@ -4,6 +4,11 @@ set -euo pipefail
 
 INITIAL_COMMIT="false"
 GITHUB_OUTPUT=${GITHUB_OUTPUT:-""}
+EXTRA_ARGS="--no-tags"
+
+if [[ "$GITHUB_REF" == "refs/tags/"* ]]; then
+  EXTRA_ARGS=""
+fi
 
 echo "::group::changed-files-diff-sha"
 
@@ -40,8 +45,6 @@ fi
 
 if [[ -z $GITHUB_BASE_REF ]]; then
   echo "Running on a push event..."
-  TARGET_BRANCH=${GITHUB_REF/refs\/heads\//} && exit_status=$? || exit_status=$?
-  CURRENT_BRANCH=$TARGET_BRANCH && exit_status=$? || exit_status=$?
 
   echo "::debug::Getting HEAD SHA..."
   if [[ -n "$INPUT_UNTIL" ]]; then
@@ -56,11 +59,15 @@ if [[ -z $GITHUB_BASE_REF ]]; then
     if [[ -z $INPUT_SHA ]]; then
       CURRENT_SHA=$(git rev-list -n 1 HEAD 2>&1) && exit_status=$? || exit_status=$?
     else
-      git fetch --no-tags -u --progress --deepen="$INPUT_FETCH_DEPTH"
+      # shellcheck disable=SC2086
+      git fetch $EXTRA_ARGS -u --progress --deepen="$INPUT_FETCH_DEPTH"
       CURRENT_SHA=$INPUT_SHA; exit_status=$?
     fi
   fi
 
+  TARGET_BRANCH=$(git name-rev --name-only "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$?
+  CURRENT_BRANCH=$TARGET_BRANCH && exit_status=$? || exit_status=$?
+
   echo "::debug::Verifying the current commit SHA: $CURRENT_SHA"
   git rev-parse --quiet --verify "$CURRENT_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
 
@@ -82,12 +89,20 @@ if [[ -z $GITHUB_BASE_REF ]]; then
         exit 1
       fi
     else
-      PREVIOUS_SHA=$(git rev-list -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+      if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "true" ]]; then
-      
+        PREVIOUS_SHA=""
-      if [[ -z "$PREVIOUS_SHA" ]]; then
+
         if [[ "$GITHUB_EVENT_FORCED" == "false" || -z "$GITHUB_EVENT_FORCED" ]]; then
           PREVIOUS_SHA=$GITHUB_EVENT_BEFORE
         fi
+      else
+        PREVIOUS_SHA=$(git rev-list -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+
+        if [[ -z "$PREVIOUS_SHA" ]]; then
+          if [[ "$GITHUB_EVENT_FORCED" == "false" || -z "$GITHUB_EVENT_FORCED" ]]; then
+            PREVIOUS_SHA=$GITHUB_EVENT_BEFORE
+          fi
+        fi
       fi
 
       if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "0000000000000000000000000000000000000000" ]]; then
@@ -110,10 +125,9 @@ if [[ -z $GITHUB_BASE_REF ]]; then
       fi
     fi
   else
-    git fetch --no-tags -u --progress --deepen="$INPUT_FETCH_DEPTH"
+    # shellcheck disable=SC2086
+    git fetch $EXTRA_ARGS -u --progress --deepen="$INPUT_FETCH_DEPTH"
     PREVIOUS_SHA=$INPUT_BASE_SHA
-    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
-    CURRENT_BRANCH=$TARGET_BRANCH
   fi
 
   echo "::debug::Target branch $TARGET_BRANCH..."
@@ -133,21 +147,26 @@ else
   CURRENT_BRANCH=$GITHUB_HEAD_REF
 
   echo "Fetching remote refs..."
-  
-  git fetch --depth="$INPUT_FETCH_DEPTH" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH"
-  git branch --track "$TARGET_BRANCH" origin/"$TARGET_BRANCH" 2>/dev/null || true
-  
-  depth=$INPUT_FETCH_DEPTH
 
-  while [ -z "$( git merge-base "$TARGET_BRANCH" HEAD )" ]; do     
+  if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "false" ]]; then
-    git fetch --deepen="$depth" origin "$TARGET_BRANCH" HEAD;
+    # shellcheck disable=SC2086
-    depth=$((depth * 10))
+    git fetch $EXTRA_ARGS --depth="$INPUT_FETCH_DEPTH" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH"
-    max_depth=5000
+    git branch --track "$TARGET_BRANCH" origin/"$TARGET_BRANCH" 2>/dev/null || true
-    
+
-    if [[ $depth -gt $max_depth ]]; then
+    depth=$INPUT_FETCH_DEPTH
-       echo "::error::Unable to find merge-base between $TARGET_BRANCH and HEAD."
+
-    fi
+    while [ -z "$( git merge-base "$TARGET_BRANCH" HEAD )" ]; do
-  done
+      # shellcheck disable=SC2086
+      git fetch $EXTRA_ARGS --deepen="$depth" origin "$TARGET_BRANCH" HEAD;
+      depth=$((depth * 10))
+      max_depth=$INPUT_MAX_FETCH_DEPTH
+
+      if [[ $depth -gt $max_depth ]]; then
+         echo "::error::Unable to find merge-base between $TARGET_BRANCH and HEAD."
+         exit 1
+      fi
+    done
+  fi
 
   echo "::debug::Getting HEAD SHA..."
   if [[ -n "$INPUT_UNTIL" ]]; then
@@ -178,10 +197,24 @@ else
   fi
 
   if [[ -z $INPUT_BASE_SHA ]]; then
-    PREVIOUS_SHA=$(git rev-list --no-merges -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+    if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "true" ]]; then
-    if [[ -z "$PREVIOUS_SHA" ]]; then
+      PREVIOUS_SHA=$GITHUB_EVENT_BEFORE
+
+      if ! git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1; then
+        PREVIOUS_SHA=$(git rev-list -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+      fi
+
+      if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "0000000000000000000000000000000000000000" ]]; then
+        PREVIOUS_SHA=$(git rev-list -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+      fi
+    else
+      PREVIOUS_SHA=$(git rev-list -n 1 "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+    fi
+
+    if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then
       PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA && exit_status=$? || exit_status=$?
     fi
+
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
   else
     PREVIOUS_SHA=$INPUT_BASE_SHA && exit_status=$? || exit_status=$?