Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: bug with finding merge-base #722

Merged
merged 8 commits into from
Oct 30, 2022
Merged

fix: bug with finding merge-base #722

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f68648
fix: bug with finding merge-base
jackton1 Oct 30, 2022
252a35e
Create diff-sha.sh
jackton1 Oct 30, 2022
096d3ea
Merge branch 'main' into fix/bug-with-finding-merge-base
jackton1 Oct 30, 2022
c276f6f
Update diff-sha.sh
jackton1 Oct 30, 2022
79704e5
Update diff-sha.sh
jackton1 Oct 30, 2022
c1cc30c
Update diff-sha.sh
jackton1 Oct 30, 2022
fcedc1d
Fixed bug with command.
jackton1 Oct 30, 2022
a8c8155
update function
jackton1 Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions diff-sha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,20 @@ else
fi

function deepenShallowCloneToFindCommit() {
local ref="$1"
local target_branch="$2"
local base_ref="$1"
local diff="$2"
local ref="$3"
local target_branch="$4"
local depth=20
local max_depth=$INPUT_MAX_FETCH_DEPTH

while ! git rev-parse --quiet --verify "$ref^{commit}" &>/dev/null; do
echo "::debug::Unable to find commit '$ref' in shallow clone. Increasing depth to $((depth * 2))..."
while ! git diff "$base_ref$diff$ref" &>/dev/null; do
echo "::debug::Unable to find merge-base in shallow clone. Increasing depth to $((depth * 2))..."

depth=$((depth * 2))

if [[ $depth -gt $max_depth ]]; then
echo "::error::Unable to find commit '$ref' in shallow clone. Maximum depth of $max_depth reached."
echo "::error::Unable to find merge-base in shallow clone. Please increase 'max_fetch_depth' to at least $((depth + 20))."
exit 1
fi

Expand Down Expand Up @@ -136,7 +138,7 @@ if [[ -z $GITHUB_BASE_REF ]]; then
echo "::debug::Current branch $CURRENT_BRANCH..."

echo "::debug::Fetching previous commit SHA: $PREVIOUS_SHA"
deepenShallowCloneToFindCommit "$PREVIOUS_SHA" "$TARGET_BRANCH"
deepenShallowCloneToFindCommit "$PREVIOUS_SHA" ".." "$CURRENT_SHA" "$TARGET_BRANCH"

echo "::debug::Verifying the previous commit SHA: $PREVIOUS_SHA"
git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
Expand All @@ -162,7 +164,7 @@ else
echo "::debug::Current branch: $CURRENT_BRANCH"

echo "::debug::Fetching previous commit SHA: $PREVIOUS_SHA"
deepenShallowCloneToFindCommit "$PREVIOUS_SHA" "$TARGET_BRANCH"
deepenShallowCloneToFindCommit "$PREVIOUS_SHA" "..." "$CURRENT_SHA" "$TARGET_BRANCH"

echo "::debug::Verifying the previous commit SHA: $PREVIOUS_SHA"
git rev-parse --quiet --verify "$PREVIOUS_SHA^{commit}" 1>/dev/null 2>&1 && exit_status=$? || exit_status=$?
Expand Down