Update diff-sha.sh

tj-actions · Dec 16, 2022 · 4837447 · 4837447
1 parent 78ac3f4
commit 4837447
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/diff-sha.sh b/diff-sha.sh
@@ -266,17 +266,16 @@ else
 
         # shellcheck disable=SC2086
         git fetch $EXTRA_ARGS -u --progress --deepen="$i" origin $TARGET_BRANCH $CURRENT_SHA 1>/dev/null 2>&1
+
+        if ((i > max_depth)); then
+          echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA"
+          exit 1
+        fi
       done
-
-      if ((i > max_depth)); then
-        echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA"
-        exit 1
-      fi
     else
       echo "::debug::Not a shallow clone, skipping merge-base check."
     fi
   fi
-
 
   echo "::debug::Target branch: $TARGET_BRANCH"
   echo "::debug::Current branch: $CURRENT_BRANCH"