fix: fail when the merge base is not found (#879)

tj-actions · Dec 16, 2022 · b75f6c0 · b75f6c0
1 parent 4f1ac05
commit b75f6c0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/diff-sha.sh b/diff-sha.sh
@@ -270,12 +270,12 @@ 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