Skip to content

Handle force-pushed public boundary scan ranges #614

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
rmcdaniel merged 3 commits into from
Oct 27, 2026
Merged

Handle force-pushed public boundary scan ranges #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e602ec
Handle force-pushed public boundary ranges
rmcdaniel Oct 21, 2026
6e520b5
Keep boundary fetch policy-compatible
rmcdaniel Oct 21, 2026
6807159
Preserve ancestry when fetching an old push tip
rmcdaniel Oct 27, 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
3 changes: 3 additions & 0 deletions .github/workflows/public-boundary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:
elif [[ "${{ github.event.before }}" =~ ^0+$ ]]; then
range="-1 ${{ github.sha }}"
else
if ! git cat-file -e '${{ github.event.before }}^{commit}' 2>/dev/null; then
git fetch --no-tags origin '${{ github.event.before }}'
fi
range="${{ github.event.before }}..${{ github.sha }}"
fi

Expand Down
33 changes: 32 additions & 1 deletion tests/Unit/Support/public_boundary_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env bash
set -euo pipefail

scanner="${1:-$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)/scripts/check-public-boundary.sh}"
repository="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
scanner="${1:-$repository/scripts/check-public-boundary.sh}"
sandbox="$(mktemp -d)"
trap 'rm -r "$sandbox"' EXIT

Expand Down Expand Up @@ -44,4 +45,34 @@ check 1 invalid-selected-commit '-1 unavailable-ref'
check 1 empty-range 'HEAD..HEAD'
check 1 original-empty-manual-range "..$forbidden"

# The old tip remains fetchable but is no longer advertised after a force push.
# Its shared ancestor has forbidden metadata that is outside the push range.
git switch --quiet -c old-tip
git commit --quiet --allow-empty -m 'Old branch tip'
old_tip="$(git rev-parse HEAD)"
git switch --quiet main
git commit --quiet --allow-empty -m 'First introduced commit'
git commit --quiet --allow-empty -m 'Second introduced commit'
new_tip="$(git rev-parse HEAD)"
git clone --quiet --bare . "$sandbox/remote.git"
git --git-dir="$sandbox/remote.git" update-ref -d refs/heads/old-tip
git --git-dir="$sandbox/remote.git" config uploadpack.allowAnySHA1InWant true
git clone --quiet --no-local --single-branch --branch main "file://$sandbox/remote.git" "$sandbox/push"
cd "$sandbox/push"
if git cat-file -e "$old_tip^{commit}" 2>/dev/null; then
printf 'FAIL divergent-push: old tip was already present\n' >&2
exit 1
fi

# Execute the workflow's actual fetch command with the fixture event SHA.
fetch_command="$(sed -n 's/^[[:space:]]*\(git fetch --no-tags .*\)$/\1/p' "$repository/.github/workflows/public-boundary.yml")"
before_expression='${{ github.event.before }}'
fetch_command="${fetch_command//"$before_expression"/$old_tip}"
bash -c "$fetch_command" > "$sandbox/fetch-output" 2>&1
check 0 divergent-push "$old_tip..$new_tip"
if [[ "$(git rev-list --count "$old_tip..$new_tip")" != 2 ]]; then
printf 'FAIL divergent-push: range includes commits outside this push\n' >&2
exit 1
fi

printf 'Public boundary metadata cases passed.\n'
Loading