mirror of
https://github.com/tj-actions/changed-files
synced 2025-02-11 03:27:46 +00:00
Update diff-sha.sh
This commit is contained in:
parent
4d1ed48b49
commit
aabcbcc882
1 changed files with 2 additions and 2 deletions
|
@ -227,7 +227,7 @@ else
|
||||||
PREVIOUS_SHA=$GITHUB_EVENT_PULL_REQUEST_BASE_SHA
|
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
|
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") && exit_status=$? || exit_status=$?
|
PREVIOUS_SHA=$(git merge-base "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$?
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -249,7 +249,7 @@ else
|
||||||
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
|
else
|
||||||
NEW_PREVIOUS_SHA=$(git merge-base --fork-point "$PREVIOUS_SHA" "$CURRENT_SHA") && exit_status=$? || exit_status=$?
|
NEW_PREVIOUS_SHA=$(git merge-base --fork-point "$TARGET_BRANCH" "$CURRENT_SHA") && exit_status=$? || exit_status=$?
|
||||||
|
|
||||||
if [[ -n "$NEW_PREVIOUS_SHA" ]]; then
|
if [[ -n "$NEW_PREVIOUS_SHA" ]]; then
|
||||||
PREVIOUS_SHA=$NEW_PREVIOUS_SHA
|
PREVIOUS_SHA=$NEW_PREVIOUS_SHA
|
||||||
|
|
Loading…
Add table
Reference in a new issue