Skip to content

Retry the Prose Gate's Diff-Base Resolve on a Fresh Merge Tip #1050

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

Merged
ptr727 merged 2 commits into from
Aug 28, 2026
Merged

Retry the Prose Gate's Diff-Base Resolve on a Fresh Merge Tip #1050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13762fc
Retry the prose gate's diff-base resolve on a fresh merge tip
ptr727 Aug 28, 2026
5cb7940
Trim the retry comment to one durable-reason line
ptr727 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .github/actions/prose-gate/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,19 @@ runs:
# Check the base resolves before scanning, so an empty or absent ref fails naming itself.
# Unresolvable, the run would report the repository's whole backlog against this change.
# A shallow checkout is the usual cause, so the caller fetches full history.
if ! git rev-parse --verify --quiet "$BASE^{commit}" >/dev/null; then
# A base that is a freshly created merge commit can still lag GitHub's own replication, so retry with backoff before failing rather than treat that lag as a gate failure.
resolved=false
for delay in 0 2 4 8 15 30; do
if [ "$delay" -gt 0 ]; then
sleep "$delay"
git fetch --quiet origin "$BASE" 2>/dev/null || true
fi
if git rev-parse --verify --quiet "$BASE^{commit}" >/dev/null; then
resolved=true
break
fi
done
if ! "$resolved"; then
echo "::error::Diff base '$BASE' does not resolve in this checkout." >&2
echo "::error::Check the ref name and that the job checks out with fetch-depth 0." >&2
exit 1
Expand Down