diff --git a/diff-sha.sh b/diff-sha.sh index dc6c3a6c..cd31e541 100644 --- a/diff-sha.sh +++ b/diff-sha.sh @@ -205,7 +205,7 @@ else fi 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 "$PREVIOUS_SHA" "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$? fi @@ -221,19 +221,18 @@ else max_depth=$INPUT_MAX_FETCH_DEPTH for ((i=0; i/dev/null 2>&1; then - PREVIOUS_SHA=$(git merge-base "$TARGET_BRANCH" "$CURRENT_SHA" 2>&1) && exit_status=$? || exit_status=$? break fi done if ((i >= max_depth)); then - echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_SHA" + echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA" exit 1 fi else