From 237b05158c7dd3dfae893d1228e8bce2e465dc90 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Thu, 15 Dec 2022 22:15:57 -0700 Subject: [PATCH] Update diff-sha.sh --- diff-sha.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff-sha.sh b/diff-sha.sh index 6740f40f..4821d106 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -165,7 +165,7 @@ else # shellcheck disable=SC2086 git fetch $EXTRA_ARGS -u --progress --depth=$(( GITHUB_EVENT_PULL_REQUEST_COMMITS + 1 )) origin +"$GITHUB_REF":refs/remotes/origin/"$CURRENT_BRANCH" 1>/dev/null 2>&1 - COMMON_ANCESTOR=$(git rev-list --ancestry-path "$GITHUB_REF".."$TARGET_BRANCH") && exit_status=$? || exit_status=$? + COMMON_ANCESTOR=$(git merge-base --fork-point "$TARGET_BRANCH" HEAD) && exit_status=$? || exit_status=$? if [[ -z "$COMMON_ANCESTOR" ]]; then echo "::debug::Unable to locate a common ancestor for the current branch: $CURRENT_BRANCH" @@ -227,7 +227,7 @@ else PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA if ! git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then - PREVIOUS_SHA=$(git merge-base "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$? + PREVIOUS_SHA=$(git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$? fi fi