Merge pull request #804 from tj-actions/fix/bug-finding-merge-base

fix: finding merge-base

.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/sync-release-version.yml

@@ -1,5 +1,8 @@
 name: Update release version.
 on:
+  push:
+    tags:
+      - '**'
   release:
     types: [published]
 

.github/workflows/test.yml

@@ -33,7 +33,7 @@ jobs:
     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 +90,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 +299,7 @@ jobs:
         uses: ./
         continue-on-error: true
         with:
-          base_sha: "4554456"
+          sha: "4774456"
 
       - name: Show output
         run: |
@@ -319,7 +319,7 @@ jobs:
         continue-on-error: true
         with:
           files: action.yml
-          base_sha: "4554456"
+          sha: "4774456"
 
       - name: Show output
         run: |

HISTORY.md

@@ -1,12 +1,40 @@
 # Changelog
 
+## [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...v34.4.0)
+
+## [v34](https://github.com/tj-actions/changed-files/tree/v34) (2022-11-11)
+
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.4...v34)
+
+**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)
+- \[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)
-
-## [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)
+[Full Changelog](https://github.com/tj-actions/changed-files/compare/v34.3.1...v34.3.3)
 
 **Fixed bugs:**
 
@@ -209,7 +237,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 +250,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.1.2...v33)
 
 **Closed issues:**
 

README.md

@@ -612,7 +612,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 ✨

diff-sha.sh

@@ -150,22 +150,8 @@ else
 
   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
-
-    depth=$INPUT_FETCH_DEPTH
-
-    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..."
@@ -223,6 +209,27 @@ 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 [ -z "$( git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA" )" ] || [ -z "$(git merge-base "$TARGET_BRANCH" "$CURRENT_SHA")" ] || [ -z "$(git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA"..."$CURRENT_SHA" | head -1)" ]; do
+        depth=$((depth + 300))
+
+        # shellcheck disable=SC2086
+        git fetch $EXTRA_ARGS --deepen="$depth" origin "$TARGET_BRANCH" HEAD;
+
+        if [[ $depth -gt $max_depth ]]; then
+          echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and HEAD"
+          exit 1
+        fi
+      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=$?