Merge pull request #709 from tj-actions/feat/add-support-for-fetching-more-history

.github/workflows/test.yml

@@ -203,8 +203,8 @@ jobs:
         shell:
           bash
 
-  test-single-commit-history:
+  test-limited-commit-history:
-    name: Test changed-files single commit history
+    name: Test changed-files with limited commit history
     runs-on: ${{ matrix.platform }}
     strategy:
       fail-fast: false
@@ -216,11 +216,10 @@ jobs:
       - name: Checkout to branch
         uses: actions/checkout@v3
         with:
-          fetch-depth: 1
+          fetch-depth: 2
 
       - name: Run changed-files with a single commit history
         id: changed-files
-        continue-on-error: true
         uses: ./
 
       - name: Show output

README.md

@@ -162,7 +162,7 @@ Support this project with a :star:
 |                  json                  |       `boolean`        | `false`  |       `false`       |                                        Output changed files in JSON format which can be used for [matrix jobs](https://github.com/tj-actions/changed-files/blob/main/.github/workflows/manual-matrix-test.yml).                                         |
 |                 since                  |        `string`        | `false`  |                     |                                                                                       Get changed files for commits whose timestamp is older than the given time.                                                                                       |
 |                 until                  |        `string`        | `false`  |                     |                                                                                      Get changed files for commits whose timestamp is earlier than the given time.                                                                                      |
-|      target\_branch\_fetch\_depth      |        `string`        | `false`  |        `20`         |                  Limit fetching commits from the target branch to a specified number. **NOTE**: This can be adjusted to resolve errors with insufficient history. See: [#668](https://github.com/tj-actions/changed-files/issues/668).                  |
+|      max\_fetch\_depth      |        `string`        | `false`  |        `120`         |                  Max limit for fetching branch history. **NOTE**: This can be adjusted to resolve errors with insufficient history.                  |
 
 ## Examples
 

action.yml

@@ -77,10 +77,10 @@ inputs:
     description: "Output changed files in JSON format which can be used for matrix jobs"
     required: false
     default: "false"
-  target_branch_fetch_depth:
+  max_fetch_depth:
-    description: "Limit fetching commits from the target branch to a specified number. **NOTE**: This can be adjusted to resolve errors with insufficient history. See: [#668](https://github.com/tj-actions/changed-files/issues/668)."
+    description: "Max limit for fetching branch history. **NOTE**: This can be adjusted to resolve errors with insufficient history."
     required: false
-    default: "20"
+    default: "120"
 
 outputs:
   added_files:
@@ -171,7 +171,7 @@ runs:
         INPUT_SINCE: ${{ inputs.since }}
         INPUT_UNTIL: ${{ inputs.until }}
         INPUT_PATH: ${{ inputs.path }}
-        INPUT_TARGET_BRANCH_FETCH_DEPTH: ${{ inputs.target_branch_fetch_depth }}
+        INPUT_MAX_FETCH_DEPTH: ${{ inputs.max_fetch_depth }}
     - name: Glob match
       uses: tj-actions/glob@v15
       id: glob

diff-sha.sh

@@ -67,6 +67,26 @@ else
   echo "::debug::Current SHA: $CURRENT_SHA"
 fi
 
+function deepenShallowCloneToFindCommit() {
+  local ref="$1"
+  local target_branch="$2"
+  local depth=20
+  local max_depth=$INPUT_MAX_FETCH_DEPTH
+
+  while ! git rev-parse --quiet --verify "$ref^{commit}" &>/dev/null; do # !0 = true = not found
+    echo "::debug::Unable to find commit '$ref' in shallow clone. Increasing depth to $((depth * 2))..."
+
+    depth=$((depth * 2))
+
+    if [[ $depth -gt $max_depth ]]; then
+      echo "::error::Unable to find commit '$ref' in shallow clone. Maximum depth of $max_depth reached."
+      exit 1
+    fi
+
+    git fetch --no-tags -u --progress --deepen="$depth" origin "$target_branch":"$target_branch"
+  done
+}
+
 if [[ -z $GITHUB_BASE_REF ]]; then
   echo "Running on a push event..."
   TARGET_BRANCH=${GITHUB_REF/refs\/heads\//} && exit_status=$? || exit_status=$?
@@ -82,8 +102,6 @@ if [[ -z $GITHUB_BASE_REF ]]; then
         exit 1
       fi
     else
-      git fetch --no-tags -u --progress origin --depth="$INPUT_TARGET_BRANCH_FETCH_DEPTH" "${TARGET_BRANCH}":"${TARGET_BRANCH}" && exit_status=$? || exit_status=$?
-
       PREVIOUS_SHA=""
 
       if [[ "$GITHUB_EVENT_FORCED" == "false" ]]; then
@@ -117,6 +135,9 @@ if [[ -z $GITHUB_BASE_REF ]]; then
   echo "::debug::Target branch $TARGET_BRANCH..."
   echo "::debug::Current branch $CURRENT_BRANCH..."
 
+  echo "::debug::Fetching previous commit SHA: $PREVIOUS_SHA"
+  deepenShallowCloneToFindCommit "$PREVIOUS_SHA" "$TARGET_BRANCH"
+
   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=$?
 
@@ -130,9 +151,6 @@ else
   TARGET_BRANCH=$GITHUB_BASE_REF
   CURRENT_BRANCH=$GITHUB_HEAD_REF
 
-  git fetch --no-tags -u --progress origin --depth="$INPUT_TARGET_BRANCH_FETCH_DEPTH" "${TARGET_BRANCH}":"${TARGET_BRANCH}" &&
-  exit_status=$? || exit_status=$?
-
   if [[ -z $INPUT_BASE_SHA ]]; then
     PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA && exit_status=$? || exit_status=$?
     echo "::debug::Previous SHA: $PREVIOUS_SHA"
@@ -143,6 +161,9 @@ else
   echo "::debug::Target branch: $TARGET_BRANCH"
   echo "::debug::Current branch: $CURRENT_BRANCH"
 
+  echo "::debug::Fetching previous commit SHA: $PREVIOUS_SHA"
+  deepenShallowCloneToFindCommit "$PREVIOUS_SHA" "$TARGET_BRANCH"
+
   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=$?