Update diff-sha.sh
This commit is contained in:
parent
aabcbcc882
commit
bdfc50c467
@ -232,7 +232,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then
|
if [[ -z "$PREVIOUS_SHA" || "$PREVIOUS_SHA" == "$CURRENT_SHA" ]]; then
|
||||||
PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA && exit_status=$? || exit_status=$?
|
PREVIOUS_SHA=$(git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "::debug::Previous SHA: $PREVIOUS_SHA"
|
echo "::debug::Previous SHA: $PREVIOUS_SHA"
|
||||||
@ -248,12 +248,6 @@ else
|
|||||||
for ((i=0; i<max_depth; i+=depth * 2)); do
|
for ((i=0; i<max_depth; i+=depth * 2)); do
|
||||||
if git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then
|
if git diff --name-only --ignore-submodules=all "$PREVIOUS_SHA$DIFF$CURRENT_SHA" 1>/dev/null 2>&1; then
|
||||||
break
|
break
|
||||||
else
|
|
||||||
NEW_PREVIOUS_SHA=$(git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$?
|
|
||||||
|
|
||||||
if [[ -n "$NEW_PREVIOUS_SHA" ]]; then
|
|
||||||
PREVIOUS_SHA=$NEW_PREVIOUS_SHA
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Fetching $i commits..."
|
echo "Fetching $i commits..."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user