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

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

.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/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,14 @@
 # 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)

README.md

@@ -70,7 +70,7 @@ jobs:
 
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v26
+        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@v26
+        uses: tj-actions/changed-files@v26.1
 
       - name: Get changed files using a comma separator
         id: changed-files-comma
-        uses: tj-actions/changed-files@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        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@v26
+        uses: tj-actions/changed-files@v26.1
         with:
           json: "true"
 ```
@@ -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@v26
+        uses: tj-actions/changed-files@v26.1
         with:
           files: |
             *.sh

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
+        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 }}"
+          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