Merge pull request #817 from tj-actions/chore/fix-error-locating-last-remote-commit-sha

chore: fix error locating last remote commit sha

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -69,13 +69,14 @@ body:
     id: logs
     attributes:
       label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output which is obtained after enabling debug logging. This will be automatically formatted into code, so no need for backticks.
       placeholder: |
-        This can be achieved by:
         1. Re-running the workflow with debug logging enabled.
         2. Copy or download the log archive.
         3. Paste the contents here or upload the file in a subsequent comment.
       render: shell
+    validations:
+      required: true
   - type: textarea
     attributes:
       label: Anything else?

.github/workflows/auto-approve.yml

@@ -3,11 +3,12 @@ name: Auto approve
 on:
   pull_request_target
 
+
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-      - uses: hmarr/auto-approve-action@v2
+      - uses: hmarr/auto-approve-action@v3
         if: |
           (
             github.event.pull_request.user.login == 'dependabot[bot]' ||

.github/workflows/test.yml

@@ -27,13 +27,15 @@ jobs:
         uses: actions/checkout@v3
       - name: shellcheck
         uses: reviewdog/action-shellcheck@v1.15
+        with:
+          github_token: ${{ secrets.PAT_TOKEN }}
 
   test-multiple-repositories:
     name: Test with multiple repositories
     runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 2
       matrix:
         platform: [ubuntu-latest, ubuntu-22.04, windows-latest, macos-latest, macos-11, ubuntu-18.04, windows-2022]
     steps:
@@ -90,7 +92,7 @@ jobs:
     if: github.event_name == 'push'
     strategy:
       fail-fast: false
-      max-parallel: 4
+      max-parallel: 2
       matrix:
         platform: [ubuntu-latest, ubuntu-22.04, windows-latest, macos-latest, macos-11, ubuntu-18.04, windows-2022]
 
@@ -299,7 +301,7 @@ jobs:
         uses: ./
         continue-on-error: true
         with:
-          base_sha: "4554456"
+          sha: "4774456"
 
       - name: Show output
         run: |
@@ -319,7 +321,7 @@ jobs:
         continue-on-error: true
         with:
           files: action.yml
-          base_sha: "4554456"
+          sha: "4774456"
 
       - name: Show output
         run: |
@@ -929,7 +931,7 @@ jobs:
         with:
           branch: ${{ steps.branch-name.outputs.base_ref_branch }}
           workflow_id: 'test.yml'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ secrets.PAT_TOKEN }}
       - name: Run changed-files with a custom base sha
         if: github.event_name == 'pull_request' && github.event.action != 'closed'
         id: changed-files-custom-base-sha

HISTORY.md

@@ -1,12 +1,89 @@
 # Changelog
 
+## [Unreleased](https://github.com/tj-actions/changed-files/tree/HEAD)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.4.3...HEAD)
+
+**Fixed bugs:**
+
+- `increase the fetch_depth to a number higher than 5000` [\#812](https://github.com/tj-actions/changed-files/issues/812)
+- \[BUG\] changed-files v34.4.2 unable to locate a common ancestor [\#809](https://github.com/tj-actions/changed-files/issues/809)
+
+## [v34.4.3](https://github.com/tj-actions/changed-files/tree/v34.4.3) (2022-11-17)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34...v34.4.3)
+
+## [v34](https://github.com/tj-actions/changed-files/tree/v34) (2022-11-17)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.4.2...v34)
+
+**Fixed bugs:**
+
+- \[BUG\] diff-sha.sh results in "fatal: ambiguous argument '': unknown revision or path not in the working tree." [\#750](https://github.com/tj-actions/changed-files/issues/750)
+
+**Merged pull requests:**
+
+- Updated README.md [\#811](https://github.com/tj-actions/changed-files/pull/811) ([jackton1](https://github.com/jackton1))
+- fix: pulling current branch history [\#810](https://github.com/tj-actions/changed-files/pull/810) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.4.2 [\#808](https://github.com/tj-actions/changed-files/pull/808) ([jackton1](https://github.com/jackton1))
+
+## [v34.4.2](https://github.com/tj-actions/changed-files/tree/v34.4.2) (2022-11-15)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.4.1...v34.4.2)
+
+**Fixed bugs:**
+
+- \[BUG\] Infinite loop on v34.4.0 [\#803](https://github.com/tj-actions/changed-files/issues/803)
+- Unable to locate a common ancestor between production\_migration and HEAD [\#802](https://github.com/tj-actions/changed-files/issues/802)
+
+**Merged pull requests:**
+
+- fix: bug with retrieving the last remote commit [\#806](https://github.com/tj-actions/changed-files/pull/806) ([jackton1](https://github.com/jackton1))
+
+## [v34.4.1](https://github.com/tj-actions/changed-files/tree/v34.4.1) (2022-11-15)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.4.0...v34.4.1)
+
+**Fixed bugs:**
+
+- \[BUG\] Very simple branch gives: "Unable to find merge-base between main and HEAD." [\#797](https://github.com/tj-actions/changed-files/issues/797)
+
+**Merged pull requests:**
+
+- chore: update sync-release-version.yml [\#805](https://github.com/tj-actions/changed-files/pull/805) ([jackton1](https://github.com/jackton1))
+- fix: finding merge-base [\#804](https://github.com/tj-actions/changed-files/pull/804) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.4.0 [\#800](https://github.com/tj-actions/changed-files/pull/800) ([jackton1](https://github.com/jackton1))
+
+## [v34.4.0](https://github.com/tj-actions/changed-files/tree/v34.4.0) (2022-11-11)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.4...v34.4.0)
+
+**Fixed bugs:**
+
+- \[BUG\] Specfic File Bug in v33 / v34 - grep: : No such file or directory [\#795](https://github.com/tj-actions/changed-files/issues/795)
+- \[BUG\] Please verify that the previous sha is valid, and increase the fetch\_depth to a number higher than 40. [\#790](https://github.com/tj-actions/changed-files/issues/790)
+
+**Merged pull requests:**
+
+- chore: update test [\#799](https://github.com/tj-actions/changed-files/pull/799) ([jackton1](https://github.com/jackton1))
+- feat: skip merge-base check for non shallow clones and fallback to using --fork-point [\#798](https://github.com/tj-actions/changed-files/pull/798) ([jackton1](https://github.com/jackton1))
+- chore: update bug issue template [\#796](https://github.com/tj-actions/changed-files/pull/796) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.3.4 [\#794](https://github.com/tj-actions/changed-files/pull/794) ([jackton1](https://github.com/jackton1))
+- chore: update readme [\#793](https://github.com/tj-actions/changed-files/pull/793) ([jackton1](https://github.com/jackton1))
+
+## [v34.3.4](https://github.com/tj-actions/changed-files/tree/v34.3.4) (2022-11-08)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.3...v34.3.4)
+
+**Merged pull requests:**
+
+- Updated README.md [\#792](https://github.com/tj-actions/changed-files/pull/792) ([jackton1](https://github.com/jackton1))
+- fix: re-add ability to change the max fetch depth [\#791](https://github.com/tj-actions/changed-files/pull/791) ([jackton1](https://github.com/jackton1))
+- Upgraded to v34.3.3 [\#788](https://github.com/tj-actions/changed-files/pull/788) ([jackton1](https://github.com/jackton1))
+
 ## [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)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.1...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:**
 
@@ -122,7 +199,6 @@
 
 **Fixed bugs:**
 
-- \[BUG\] diff-sha.sh results in "fatal: ambiguous argument '': unknown revision or path not in the working tree." [\#750](https://github.com/tj-actions/changed-files/issues/750)
 - \[BUG\] Action failing on PR with "Unable to find merge-base in shallow clone" [\#737](https://github.com/tj-actions/changed-files/issues/737)
 - \[BUG\] Wrong changed-files returned for forked PRs [\#714](https://github.com/tj-actions/changed-files/issues/714)
 
@@ -209,7 +285,7 @@
 
 ## [v34.0.0](https://github.com/tj-actions/changed-files/tree/v34.0.0) (2022-10-25)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v33...v34.0.0)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v33.0.0...v34.0.0)
 
 **Fixed bugs:**
 
@@ -222,13 +298,13 @@
 - feat: add support for fetching more history [\#709](https://github.com/tj-actions/changed-files/pull/709) ([jackton1](https://github.com/jackton1))
 - Upgraded to v33.0.0 [\#707](https://github.com/tj-actions/changed-files/pull/707) ([jackton1](https://github.com/jackton1))
 
-## [v33](https://github.com/tj-actions/changed-files/tree/v33) (2022-10-21)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v33.0.0...v33)
-
 ## [v33.0.0](https://github.com/tj-actions/changed-files/tree/v33.0.0) (2022-10-21)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32.1.2...v33.0.0)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v33...v33.0.0)
+
+## [v33](https://github.com/tj-actions/changed-files/tree/v33) (2022-10-21)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32...v33)
 
 **Closed issues:**
 
@@ -247,13 +323,13 @@
 - chore\(deps\): update tj-actions/verify-changed-files action to v12 [\#696](https://github.com/tj-actions/changed-files/pull/696) ([renovate[bot]](https://github.com/apps/renovate))
 - Upgraded to v32.1.2 [\#695](https://github.com/tj-actions/changed-files/pull/695) ([jackton1](https://github.com/jackton1))
 
-## [v32.1.2](https://github.com/tj-actions/changed-files/tree/v32.1.2) (2022-10-16)
-
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32...v32.1.2)
-
 ## [v32](https://github.com/tj-actions/changed-files/tree/v32) (2022-10-16)
 
-[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32.1.1...v32)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32.1.2...v32)
+
+## [v32.1.2](https://github.com/tj-actions/changed-files/tree/v32.1.2) (2022-10-16)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v32.1.1...v32.1.2)
 
 **Fixed bugs:**
 
@@ -1850,7 +1926,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...v7)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v6.3...v7)
 
 **Closed issues:**
 
@@ -1866,13 +1942,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](https://github.com/tj-actions/changed-files/tree/v6) (2021-05-26)
-
-[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)
+[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)
 
 **Merged pull requests:**
 

README.md

@@ -162,7 +162,7 @@ Support this project with a :star:
 |             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.                        |
 |             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"`         |                                                 Initial 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\_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.                                                            |
@@ -336,8 +336,7 @@ See [outputs](#outputs) for a list of all available outputs.
       id: changed-files-specific-source-file
       uses: tj-actions/changed-files@v34
       with:
-        files_from_source_file: |
+        files_from_source_file: test/changed-files-list.txt
-          test/changed-files-list.txt
 ...
 ```
 
@@ -612,7 +611,7 @@ Report bugs at https://github.com/tj-actions/changed-files/issues.
 If you are reporting a bug, please include:
 
 *   Your operating system name and version.
-*   Any details about your workflow that might be helpful in troubleshooting.
+*   Any details about your workflow that might be helpful in troubleshooting. (**NOTE**: Ensure that you include full log outputs with debugging enabled)
 *   Detailed steps to reproduce the bug.
 
 ## Contributors ✨

action.yml

@@ -78,7 +78,7 @@ inputs:
     required: false
     default: "false"
   fetch_depth:
-    description: "Limit depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
+    description: "Initial depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
     required: false
     default: "40"
   max_fetch_depth:

diff-sha.sh

@@ -5,6 +5,8 @@ set -euo pipefail
 INITIAL_COMMIT="false"
 GITHUB_OUTPUT=${GITHUB_OUTPUT:-""}
 EXTRA_ARGS="--no-tags"
+PREVIOUS_SHA=""
+CURRENT_SHA=""
 
 if [[ "$GITHUB_REF" == "refs/tags/"* ]]; then
   EXTRA_ARGS=""
@@ -145,27 +147,20 @@ else
   echo "Running on a pull request event..."
   TARGET_BRANCH=$GITHUB_BASE_REF
   CURRENT_BRANCH=$GITHUB_HEAD_REF
+  
+  if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "true" ]]; then
+    TARGET_BRANCH=$CURRENT_BRANCH
+  fi
 
   echo "Fetching remote refs..."
 
   if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "false" ]]; then
     # shellcheck disable=SC2086
-    git fetch $EXTRA_ARGS --depth="$INPUT_FETCH_DEPTH" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH"
+    git fetch -u --progress $EXTRA_ARGS --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
-
+  else
-    depth=$INPUT_FETCH_DEPTH
+    # shellcheck disable=SC2086
-
+    git fetch $EXTRA_ARGS -u --progress --depth="$INPUT_FETCH_DEPTH" origin +"$GITHUB_REF":refs/remotes/origin/"$CURRENT_BRANCH"
-    while [ -z "$( git merge-base "$TARGET_BRANCH" HEAD )" ]; do
-      # 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..."
@@ -201,14 +196,15 @@ else
       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=$?
+        # shellcheck disable=SC2046
-      fi
+        PREVIOUS_SHA=$(git rev-parse origin/"$CURRENT_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
-
-      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=$?
+      PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA && exit_status=$? || exit_status=$?
+      
+      if ! git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA"..."$CURRENT_SHA" 1>/dev/null 2>&1; then
+        PREVIOUS_SHA=$(git rev-parse origin/"$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
+      fi
     fi
 
     if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then
@@ -223,6 +219,29 @@ else
   echo "::debug::Target branch: $TARGET_BRANCH"
   echo "::debug::Current branch: $CURRENT_BRANCH"
 
+  if [[ "$INPUT_SINCE_LAST_REMOTE_COMMIT" == "false" ]]; then
+    if [[ -f .git/shallow ]]; then
+      depth=$INPUT_FETCH_DEPTH
+      max_depth=$INPUT_MAX_FETCH_DEPTH
+
+      while ! git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA"..."$CURRENT_SHA" 1>/dev/null; do
+        echo "Fetching $depth commits..."
+
+        # shellcheck disable=SC2086
+        git fetch $EXTRA_ARGS -u --progress --deepen="$depth" origin +"$GITHUB_REF":refs/remotes/origin/"$CURRENT_BRANCH"
+
+        if [[ $depth -gt $max_depth ]]; then
+          echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_SHA"
+          exit 1
+        fi
+        
+        depth=$((depth + 300))
+      done
+    else
+      echo "::debug::Not a shallow clone, skipping merge-base check."
+    fi
+  fi
+
   echo "::debug::Verifying the previous commit SHA: $PREVIOUS_SHA"
   git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?