From 40f3d5695f9708f982dcaf5bb92fb6e21bf6bef7 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 16 Dec 2022 07:26:20 -0700 Subject: [PATCH] Update diff-sha.sh --- diff-sha.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/diff-sha.sh b/diff-sha.sh index ae65e35e..dac16aab 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -251,6 +251,14 @@ else fi echo "Fetching $i commits..." + + if [[ -z "$INPUT_BASE_SHA" ]]; then + NEW_PREVIOUS_SHA=$(git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA") + + if [[ -n $NEW_PREVIOUS_SHA ]]; then + PREVIOUS_SHA=$NEW_PREVIOUS_SHA + fi + fi # shellcheck disable=SC2086 git fetch $EXTRA_ARGS -u --progress --deepen="$i" origin $TARGET_BRANCH $CURRENT_SHA 1>/dev/null 2>&1