Repository navigation
ci(guard): find the merge base on a shallow checkout and fail closed when it cannot - #359
Merged
Merged
Conversation
…when it cannot repo-template#584: the detect job's checkout is depth 1, so the guard's three-dot diff had no merge base, failed silently and reported "no protected configuration files changed" for every PR. Deepen the PR head until a merge base exists, diff against it explicitly, and error out if none can be found. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fleet copy of Chris-Wolfgang/repo-template#584's guard fix. The first live run of the new guard (repo-template#582) passed a PR that changed
pr.yaml: thedetect-projectscheckout is depth 1, somain-branch...HEADhad no merge base, the diff failed silently and the guard reported "no protected configuration files changed" — i.e. onmainright now the guard passes everything. This deepens the PR head until a merge base exists (token-authenticated, so private repos work), diffs against it explicitly, and fails closed with::error::if none can be found.Config-only PR. It runs under
main's currently-open guard, so it merges normally with the ruleset active; the first config-only PR after it is the real proof.🤖 Generated with Claude Code