Update diff-sha.sh

This commit is contained in:
Tonye Jack 2022-12-16 11:29:59 -07:00 committed by GitHub
parent 78ac3f4d78
commit 4837447a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -266,18 +266,17 @@ else
# shellcheck disable=SC2086 # shellcheck disable=SC2086
git fetch $EXTRA_ARGS -u --progress --deepen="$i" origin $TARGET_BRANCH $CURRENT_SHA 1>/dev/null 2>&1 git fetch $EXTRA_ARGS -u --progress --deepen="$i" origin $TARGET_BRANCH $CURRENT_SHA 1>/dev/null 2>&1
done
if ((i > max_depth)); then 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" echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA"
exit 1 exit 1
fi fi
done
else else
echo "::debug::Not a shallow clone, skipping merge-base check." echo "::debug::Not a shallow clone, skipping merge-base check."
fi fi
fi fi
echo "::debug::Target branch: $TARGET_BRANCH" echo "::debug::Target branch: $TARGET_BRANCH"
echo "::debug::Current branch: $CURRENT_BRANCH" echo "::debug::Current branch: $CURRENT_BRANCH"