Fixed bug retrieving the first commit of a pull request

tj-actions · Oct 31, 2022 · 1e6b143 · 1e6b143
1 parent 983dfd7
commit 1e6b143
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/diff-sha.sh b/diff-sha.sh
@@ -111,14 +111,16 @@ if [[ -z $GITHUB_BASE_REF ]]; then
       fi
 
       if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "0000000000000000000000000000000000000000" ]]; then
-        PREVIOUS_SHA=$(git rev-parse "$(git branch -r --sort=-committerdate | head -1 | xargs)")
+        PREVIOUS_SHA=$CURRENT_SHA
       fi
 
       if [[ "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then
         if ! git rev-parse "$PREVIOUS_SHA^1" &>/dev/null; then
           INITIAL_COMMIT="true"
           PREVIOUS_SHA=$(git rev-parse "$CURRENT_SHA")
           echo "::warning::Initial commit detected no previous commit found."
+        else
+          PREVIOUS_SHA=$(git rev-parse "$PREVIOUS_SHA^1")
         fi
       else
         if [[ -z "$PREVIOUS_SHA" ]]; then