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: fail when the merge base is not found #879

Merged
merged 4 commits into from Dec 16, 2022
Merged

fix: fail when the merge base is not found #879

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
878c5f3
fix: fail when the merge base is not found
jackton1 Dec 16, 2022
eab1f10
Update diff-sha.sh
jackton1 Dec 16, 2022
20895ba
Merge branch 'main' into fix/fail-when-the-merge-base-is-not-found
jackton1 Dec 16, 2022
3085a5f
Update diff-sha.sh
jackton1 Dec 16, 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
10 changes: 5 additions & 5 deletions diff-sha.sh
View file
Open in desktop
Expand Up @@ -270,12 +270,12 @@ else

# shellcheck disable=SC2086
git fetch $EXTRA_ARGS -u --progress --deepen="$i" origin $TARGET_BRANCH $CURRENT_SHA 1>/dev/null 2>&1

if ((i > max_depth)); then
echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA"
exit 1
fi
done

if ((i > max_depth)); then
echo "::error::Unable to locate a common ancestor between $TARGET_BRANCH and $CURRENT_BRANCH with: $PREVIOUS_SHA$DIFF$CURRENT_SHA"
exit 1
fi
else
echo "::debug::Not a shallow clone, skipping merge-base check."
fi
Expand Down