Skip to content

Commit

Permalink
Merge pull request #860 from tj-actions/fix/error-with-retrieving-cha…
Browse files Browse the repository at this point in the history
…nged-files-for-closed-prs

fix: error with retrieving changed files for closed prs
  • Loading branch information
repo-ranger[bot] committed Dec 14, 2022
2 parents cd8e421 + a736911 commit 4f64429
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions diff-sha.sh
Expand Up @@ -165,24 +165,23 @@ 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 --first-parent --max-parents=0 --max-count=1 origin/"$CURRENT_BRANCH" 2>&1) && exit_status=$? || exit_status=$?
COMMON_ANCESTOR=$(git rev-list --first-parent --max-parents=0 --max-count=1 origin/"$CURRENT_BRANCH") && exit_status=$? || exit_status=$?

if [[ -z "$COMMON_ANCESTOR" ]]; then
echo "::error::Unable to locate a common ancestor for the current branch: $CURRENT_BRANCH"
exit 1
echo "::debug::Unable to locate a common ancestor for the current branch: $CURRENT_BRANCH"
else
echo "::debug::Common ancestor: $COMMON_ANCESTOR"
fi

DATE=$(git log --date=iso8601 --format=%cd "${COMMON_ANCESTOR}")
DATE=$(git log --date=iso8601 --format=%cd "${COMMON_ANCESTOR}")

if [[ -z "$DATE" ]]; then
echo "::error::Unable to locate a date for the common ancestor: $COMMON_ANCESTOR"
exit 1
else
# shellcheck disable=SC2086
git fetch $EXTRA_ARGS --shallow-since="${DATE}" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH" 1>/dev/null 2>&1
echo "::debug::Date: $DATE"
if [[ -z "$DATE" ]]; then
echo "::error::Unable to locate a date for the common ancestor: $COMMON_ANCESTOR"
exit 1
else
# shellcheck disable=SC2086
git fetch $EXTRA_ARGS --shallow-since="${DATE}" origin +refs/heads/"$TARGET_BRANCH":refs/remotes/origin/"$TARGET_BRANCH" 1>/dev/null 2>&1
echo "::debug::Date: $DATE"
fi
fi
else
# shellcheck disable=SC2086
Expand Down

0 comments on commit 4f64429

Please sign in to comment.