fix: bug force pushing commits after a rebase (#583)

Co-authored-by: jackton1 <jackton1@users.noreply.github.com>

.all-contributorsrc

@@ -123,6 +123,15 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "thyarles",
+      "name": "Charles Santos",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1340046?v=4",
+      "profile": "https://www.credly.com/users/thyarles/badges",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/submodule-sync.yml

@@ -19,7 +19,7 @@ jobs:
           git submodule update --remote --recursive
       
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.0.4
+        uses: peter-evans/create-pull-request@v4.1.0
         with:
           title: "Updated submodule"
           branch: "chore/update-submodule"

.github/workflows/sync-release-version.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           output: 'HISTORY.md'
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4.0.4
+        uses: peter-evans/create-pull-request@v4.1.0
         with:
           base: "main"
           title: "Upgraded to ${{ steps.sync-release-version.outputs.new_version }}"

.github/workflows/test.yml

@@ -367,18 +367,20 @@ jobs:
           bash
       - name: Run changed-files for old new filenames test rename 1
         id: changed-files-all-old-new-renamed-files-1
+        if: contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner
         uses: ./
         with:
           base_sha: d1c0ee4
           sha: 4d04215
           include_all_old_new_renamed_files: true
       - name: Show output
+        if: contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner
         run: |
           echo '${{ toJSON(steps.changed-files-all-old-new-renamed-files-1.outputs) }}'
         shell:
           bash
       - name: Check all_old_new_renamed_files output
-        if: "!contains(steps.changed-files-all-old-new-renamed-files-1.outputs.all_old_new_renamed_files, 'test/test rename 1.txt,test/test rename-1.txt')"
+        if: "!contains(steps.changed-files-all-old-new-renamed-files-1.outputs.all_old_new_renamed_files, 'test/test rename 1.txt,test/test rename-1.txt') && (contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner)"
         run: |
           echo "Invalid output: Expected to include (test/test rename 1.txt,test/test rename-1.txt) got (${{ steps.changed-files-all-old-new-renamed-files-1.outputs.all_old_new_renamed_files }})"
           exit 1
@@ -386,18 +388,20 @@ jobs:
           bash
       - name: Run changed-files for old new filenames test rename 2
         id: changed-files-all-old-new-renamed-files-2
+        if: contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner
         uses: ./
         with:
           base_sha: 4d04215
           sha: fe238e6
           include_all_old_new_renamed_files: true
       - name: Show output
+        if: contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner
         run: |
           echo '${{ toJSON(steps.changed-files-all-old-new-renamed-files-2.outputs) }}'
         shell:
           bash
       - name: Check all_old_new_renamed_files output
-        if: "!contains(steps.changed-files-all-old-new-renamed-files-2.outputs.all_old_new_renamed_files, 'test/test rename 2.txt,test/test rename-2.txt')"
+        if: "!contains(steps.changed-files-all-old-new-renamed-files-2.outputs.all_old_new_renamed_files, 'test/test rename 2.txt,test/test rename-2.txt') && (contains('dependabot[bot] dependabot renovate[bot] renovate', github.actor) || github.event.pull_request.head.repo.owner.login == github.repository_owner)"
         run: |
           echo "Invalid output: Expected to include (test/test rename 2.txt test/test rename-2.txt) got (${{ steps.changed-files-all-old-new-renamed-files-2.outputs.all_old_new_renamed_files }})"
           exit 1

.github/workflows/update-readme.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Create Pull Request
         if: failure()
-        uses: peter-evans/create-pull-request@v4.0.4
+        uses: peter-evans/create-pull-request@v4.1.0
         with:
           base: "main"
           title: "Updated README.md"

HISTORY.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## [v26.1](https://github.com/tj-actions/changed-files/tree/v26.1) (2022-08-15)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v26...v26.1)
+
+**Merged pull requests:**
+
+- fix: error retrieving base sha. [\#579](https://github.com/tj-actions/changed-files/pull/579) ([jackton1](https://github.com/jackton1))
+- Upgraded to v26 [\#577](https://github.com/tj-actions/changed-files/pull/577) ([jackton1](https://github.com/jackton1))
+
+## [v26](https://github.com/tj-actions/changed-files/tree/v26) (2022-08-15)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v25...v26)
+
+**Implemented enhancements:**
+
+- \[Feature\] Git version dependency [\#564](https://github.com/tj-actions/changed-files/issues/564)
+
+**Fixed bugs:**
+
+- \[BUG\] Will output all changed files if not file matches the `**/*.sql` pattern [\#565](https://github.com/tj-actions/changed-files/issues/565)
+
+**Merged pull requests:**
+
+- chore: remove extra space. [\#576](https://github.com/tj-actions/changed-files/pull/576) ([jackton1](https://github.com/jackton1))
+- Updated README.md [\#575](https://github.com/tj-actions/changed-files/pull/575) ([jackton1](https://github.com/jackton1))
+- docs: add thyarles as a contributor for code [\#574](https://github.com/tj-actions/changed-files/pull/574) ([allcontributors[bot]](https://github.com/apps/allcontributors))
+- chore: restrict rename test to non forks [\#573](https://github.com/tj-actions/changed-files/pull/573) ([jackton1](https://github.com/jackton1))
+- feat: validate the minimum required git version [\#572](https://github.com/tj-actions/changed-files/pull/572) ([jackton1](https://github.com/jackton1))
+- chore: remove unused code [\#571](https://github.com/tj-actions/changed-files/pull/571) ([jackton1](https://github.com/jackton1))
+- improvement: Simplify checks [\#570](https://github.com/tj-actions/changed-files/pull/570) ([thyarles](https://github.com/thyarles))
+- Upgraded to v25 [\#567](https://github.com/tj-actions/changed-files/pull/567) ([jackton1](https://github.com/jackton1))
+
+## [v25](https://github.com/tj-actions/changed-files/tree/v25) (2022-08-08)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v24.1...v25)
+
+**Fixed bugs:**
+
+- \[BUG\] missing opening '\(' then stop with windows-latest [\#562](https://github.com/tj-actions/changed-files/issues/562)
+
+**Merged pull requests:**
+
+- chore\(deps\): upgrade tj-actions/glob v9.2 to v10 [\#566](https://github.com/tj-actions/changed-files/pull/566) ([jackton1](https://github.com/jackton1))
+- Upgraded to v24.1 [\#561](https://github.com/tj-actions/changed-files/pull/561) ([jackton1](https://github.com/jackton1))
+
 ## [v24.1](https://github.com/tj-actions/changed-files/tree/v24.1) (2022-08-03)
 
 [Full Changelog](https://github.com/tj-actions/changed-files/compare/v24...v24.1)
@@ -646,7 +691,7 @@
 
 ## [v13](https://github.com/tj-actions/changed-files/tree/v13) (2022-02-17)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v12.2...v13)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v2.0.1...v13)
 
 **Implemented enhancements:**
 
@@ -665,13 +710,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)
 
-## [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/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)
+[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)
 
 **Merged pull requests:**
 
@@ -821,7 +866,7 @@
 
 ## [v1.2.1](https://github.com/tj-actions/changed-files/tree/v1.2.1) (2021-11-08)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.5...v1.2.1)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.2.0...v1.2.1)
 
 **Implemented enhancements:**
 
@@ -835,13 +880,13 @@
 - Update actions/checkout action to v2.4.0 [\#243](https://github.com/tj-actions/changed-files/pull/243) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v11.5 [\#241](https://github.com/tj-actions/changed-files/pull/241) ([jackton1](https://github.com/jackton1))
 
-## [v11.5](https://github.com/tj-actions/changed-files/tree/v11.5) (2021-10-30)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v1.2.0...v11.5)
-
 ## [v1.2.0](https://github.com/tj-actions/changed-files/tree/v1.2.0) (2021-10-30)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.4...v1.2.0)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.5...v1.2.0)
+
+## [v11.5](https://github.com/tj-actions/changed-files/tree/v11.5) (2021-10-30)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v11.4...v11.5)
 
 **Merged pull requests:**
 

README.md

@@ -7,7 +7,7 @@
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 
-[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)
 
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
@@ -70,7 +70,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
 
       - name: List all changed files
         run: |
@@ -163,11 +163,11 @@ Support this project with a :star:
 
       - name: Get changed files using defaults
         id: changed-files
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
 
       - name: Get changed files using a comma separator
         id: changed-files-comma
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           separator: ","
 
@@ -189,7 +189,7 @@ Support this project with a :star:
 
       - name: Get specific changed files
         id: changed-files-specific
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           files: |
             my-file.txt
@@ -230,14 +230,14 @@ Support this project with a :star:
 
       - name: Use a source file or list of file(s) to populate to files input.
         id: changed-files-specific-source-file
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           files_from_source_file: |
             test/changed-files-list.txt
 
       - name: Use a source file or list of file(s) to populate to files input and optionally specify more files.
         id: changed-files-specific-source-file-and-specify-files
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           files_from_source_file: |
             test/changed-files-list.txt
@@ -246,13 +246,13 @@ Support this project with a :star:
 
       - name: Use a different commit SHA
         id: changed-files-custom-sha
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           sha: ${{ github.event.pull_request.head.sha }}
 
       - name: Use a different base SHA
         id: changed-files-custom-base-sha
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           base_sha: "2096ed0"
           
@@ -264,7 +264,7 @@ Support this project with a :star:
 
       - name: Run changed-files with defaults on the dir1
         id: changed-files-for-dir1
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           path: dir1
 
@@ -276,19 +276,19 @@ Support this project with a :star:
 
       - name: Run changed-files using the last commit on the remote branch
         id: changed-files-since-last-remote-commit
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           since_last_remote_commit: "true"
       
       - name: Run changed-files using the fork point of a pull request
         id: changed-files-fork-point
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           use_fork_point: "true"
           
       - name: Run changed-files with quotepath disabled
         id: changed-files-quotepath
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           quotepath: "false"
       
@@ -310,7 +310,7 @@ Support this project with a :star:
 
       - name: Run changed-files with the commit of the last successful test workflow run
         id: changed-files-base-sha-push
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           base_sha: ${{ steps.last_successful_commit_push.outputs.commit_hash }}
 
@@ -331,20 +331,20 @@ Support this project with a :star:
       - name: Run changed-files with the commit of the last successful test workflow run on main
         if: github.event_name == 'pull_request'
         id: changed-files-base-sha-pull-request
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           base_sha: ${{ steps.last_successful_commit_pull_request.outputs.commit_hash }}
 
       - name: Run changed-files with dir_names
         id: changed-files-dir-names
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           dir_names: "true"
       
       # All outputs are JSON formatted arrays and can be used in other actions and matrix compatible jobs.
       - name: Run changed-files with json output
         id: changed-files-json
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           json: "true"
 ```
@@ -368,7 +368,7 @@ This project follows a `v(major).(patch)` versioning scheme with the exception o
 
 > NOTE: :warning:
 >
-> *   Users referencing the legacy `v1.x.x` -> `v5.0.0` semantic versions, are required to switch over to `v10.x` -> `v15.x` respectively as new releases would no longer be deployed using the old versioning scheme.
+> *   Users referencing the legacy `v1.x.x` → `v5.0.0` semantic versions, are required to switch over to `v10.x` → `v15.x` respectively as new releases would no longer be deployed using the old versioning scheme.
 > *   A breaking change was introduced in `v1.1.4` and `v13.x` which has been fixed.
 
 ## Migration guide
@@ -397,7 +397,7 @@ With the switch from using grep's Extended regex to match files to the natively
 
       - name: Get specific changed files
         id: changed-files-specific
-        uses: tj-actions/changed-files@v24.1
+        uses: tj-actions/changed-files@v26.1
         with:
           files: |
             *.sh
@@ -451,6 +451,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/pkit"><img src="https://avatars.githubusercontent.com/u/805654?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Constantine Peresypkin</b></sub></a><br /><a href="https://github.com/tj-actions/changed-files/commits?author=pkit" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/deronnax"><img src="https://avatars.githubusercontent.com/u/439279?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mathieu Dupuy</b></sub></a><br /><a href="https://github.com/tj-actions/changed-files/commits?author=deronnax" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/JoeOvo"><img src="https://avatars.githubusercontent.com/u/100686542?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joe Moggridge</b></sub></a><br /><a href="https://github.com/tj-actions/changed-files/commits?author=JoeOvo" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://www.credly.com/users/thyarles/badges"><img src="https://avatars.githubusercontent.com/u/1340046?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Charles Santos</b></sub></a><br /><a href="https://github.com/tj-actions/changed-files/commits?author=thyarles" title="Code">💻</a></td>
   </tr>
 </table>
 

action.yml

@@ -154,8 +154,13 @@ runs:
         # "Set base sha..."
         if [[ -n "${{ inputs.base_sha }}" ]]; then
           echo "::set-output name=base_sha::${{ inputs.base_sha }}"
-        elif [[ "${{ inputs.since_last_remote_commit }}" == "true" && "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then
-            echo "::set-output name=base_sha::${{ github.event.before }}"
+        elif [[ "${{ inputs.since_last_remote_commit }}" == "true" && "${{ github.event.forced }}" == "true" && "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then
+          LAST_REMOTE_COMMIT=$(git rev-parse $(git branch -r --sort=-committerdate | head -1))
+          if [[ "${{ inputs.sha }}" != "$LAST_REMOTE_COMMIT" ]]; then
+            echo "::set-output name=base_sha::$LAST_REMOTE_COMMIT"
+          fi
+        elif [[ "${{ inputs.since_last_remote_commit }}" == "true" && "${{ github.event.forced }}" != "true" && "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]]; then
+          echo "::set-output name=base_sha::${{ github.event.before }}"
         fi
       id: base-sha
       shell: bash

diff-sha.sh

@@ -17,26 +17,38 @@ if [[ -n $INPUT_PATH ]]; then
   cd "$REPO_DIR"
 fi
 
-git --version 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
+echo "Verifying git version..."
+
+function __version() { 
+  echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; 
+}
+
+GIT_VERSION=$(git --version | awk '{print $3}'); exit_status=$?   
 
 if [[ $exit_status -ne 0 ]]; then
   echo "::error::git not installed"
   exit 1
 fi
 
+if [[ $(__version "$GIT_VERSION") -lt $(__version "2.18.0") ]]; then
+  echo "::error::Invalid git version. Please upgrade git ($GIT_VERSION) to >= (2.18.0)"
+  exit 1
+else
+  echo "Valid git version found: ($GIT_VERSION)"
+fi
+
 echo "::debug::Getting HEAD SHA..."
 
 if [[ -z $INPUT_SHA ]]; then
-  CURRENT_SHA=$(git rev-list -n 1 "HEAD" 2>&1) && exit_status=$? || exit_status=$?
+  CURRENT_SHA=$(git rev-list -n 1 "HEAD" 2>&1); exit_status=$?
 else
-  CURRENT_SHA=$INPUT_SHA && exit_status=$? || exit_status=$?
+  CURRENT_SHA=$INPUT_SHA; exit_status=$?
 fi
 
-git rev-parse --quiet --verify "$CURRENT_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
+git rev-parse --quiet --verify "$CURRENT_SHA^{commit}" 1>/dev/null 2>&1; exit_status=$?
 
 if [[ $exit_status -ne 0 ]]; then
   echo "::error::Unable to locate the current sha: $CURRENT_SHA"
-  git --version
   echo "::error::You seem to be missing 'fetch-depth: 0' or 'fetch-depth: 2'. See https://github.com/tj-actions/changed-files#usage"
   exit 1
 else
@@ -51,22 +63,22 @@ if [[ -z $GITHUB_BASE_REF ]]; then
 
   if [[ -z $INPUT_BASE_SHA ]]; then
     if [[ $(git rev-list --count "HEAD") -gt 1 ]]; then
-      PREVIOUS_SHA=$(git rev-parse "@~" 2>&1) && exit_status=$? || exit_status=$?
+      PREVIOUS_SHA=$(git rev-parse "@~" 2>&1); exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     else
-      PREVIOUS_SHA=$CURRENT_SHA && exit_status=$? || exit_status=$?
+      PREVIOUS_SHA=$CURRENT_SHA; exit_status=$?
       INITIAL_COMMIT="true"
       echo "::debug::Initial commit detected"
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     fi
   else
-    PREVIOUS_SHA=$INPUT_BASE_SHA && exit_status=$? || exit_status=$?
-    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
+    PREVIOUS_SHA=$INPUT_BASE_SHA; exit_status=$?
+    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1); exit_status=$?
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
     echo "::debug::Target branch: $TARGET_BRANCH"
   fi
 
-  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
+  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1; exit_status=$?
 
   if [[ $exit_status -ne 0 ]]; then
     echo "::error::Unable to locate the previous sha: $PREVIOUS_SHA"
@@ -82,24 +94,24 @@ else
   if [[ -z $INPUT_BASE_SHA ]]; then
     if [[ "$INPUT_USE_FORK_POINT" == "true" ]]; then
       echo "::debug::Getting fork point..."
-      git fetch --no-tags -u --progress origin "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
-      PREVIOUS_SHA=$(git merge-base --fork-point "${TARGET_BRANCH}" "$(git name-rev --name-only "$CURRENT_SHA")") && exit_status=$? || exit_status=$?
+      git fetch --no-tags -u --progress origin "${TARGET_BRANCH}":"${TARGET_BRANCH}"; exit_status=$?
+      PREVIOUS_SHA=$(git merge-base --fork-point "${TARGET_BRANCH}" "$(git name-rev --name-only "$CURRENT_SHA")"); exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     else
-      git fetch --no-tags -u --progress origin --depth=1 "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
-      PREVIOUS_SHA=$(git rev-list -n 1 "${TARGET_BRANCH}" 2>&1) && exit_status=$? || exit_status=$?
+      git fetch --no-tags -u --progress origin --depth=1 "${TARGET_BRANCH}":"${TARGET_BRANCH}"; exit_status=$?
+      PREVIOUS_SHA=$(git rev-list -n 1 "${TARGET_BRANCH}" 2>&1); exit_status=$?
       echo "::debug::Previous SHA: $PREVIOUS_SHA"
     fi
   else
-    git fetch --no-tags -u --progress origin --depth=1 "$INPUT_BASE_SHA" && exit_status=$? || exit_status=$?
+    git fetch --no-tags -u --progress origin --depth=1 "$(git rev-parse --verify "$INPUT_BASE_SHA")"; exit_status=$?
     PREVIOUS_SHA=$INPUT_BASE_SHA
-    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1) && exit_status=$? || exit_status=$?
+    TARGET_BRANCH=$(git name-rev --name-only "$PREVIOUS_SHA" 2>&1); exit_status=$?
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
     echo "::debug::Target branch: $TARGET_BRANCH"
   fi
 
   echo "::debug::Verifying commit SHA..."
-  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
+  git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1; exit_status=$?
 
   if [[ $exit_status -ne 0 ]]; then
     echo "::error::Unable to locate the previous sha: $PREVIOUS_SHA"