Updated diff-sha.sh

tj-actions · Nov 17, 2022 · 30b9252 · 30b9252
1 parent 3b10ceb
commit 30b9252
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/action.yml b/action.yml
@@ -80,7 +80,7 @@ inputs:
   fetch_depth:
     description: "Initial depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
     required: false
-    default: "10"
+    default: "40"
   max_fetch_depth:
     description: "Maximum depth of the branch history fetched. **NOTE**: This can be adjusted to resolve errors with insufficient history."
     required: false

diff --git a/diff-sha.sh b/diff-sha.sh
@@ -191,7 +191,7 @@ else
         PREVIOUS_SHA=$(git rev-parse $(git branch -r --sort=-committerdate | head -1) 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=$(git merge-base --fork-point "$CURRENT_BRANCH" "$TARGET_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
     fi
 
     if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then