Repository navigation
feat(mergify): subtree PRs merge with a merge commit, never a squash (SYS-1246) - #3
Open
systemfsoftware-maker wants to merge 1 commit into
Open
systemfsoftware-maker wants to merge 1 commit into
systemfsoftware-maker wants to merge 1 commit into
Conversation
…(SYS-1246) Implements the org subtree-queue convention (systemfsoftware/.github#6): a subtree queue keyed on the anchored git-subtree-dir/git-subtree-split trailer pairs plus this repo's existing checks, merging with a merge commit; the default queue excludes trailer-bearing PRs, claim-titled subtree PRs, and hand edits under the declared subtree prefixes, so a subtree PR can never squash and an unrecognised claim cannot merge at all. Recognition reads the commits themselves; same checks, approvals and protections as before.
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.
SYS-1246. Implements the org subtree-queue convention from systemfsoftware/.github#6 (ruling 9: subtree PRs merge with a merge commit, never a squash).\n\n## What changes\n\n- New queue (before ): , recognised from the commits themselves — a PR qualifies only when its commits carry the anchored + trailer pair that writes. Same check conditions as .\n- ** gains three exclusions**: trailer-bearing PRs, subtree-claim-titled PRs, and (this repo declares no subtree prefixes, so no path exclusion is needed). A subtree PR therefore can never squash, and a subtree claim without commit evidence matches no queue and cannot merge at all.\n- Pure subtree removals stay exempt; hand edits to vendored paths without trailers are blocked (that is the exact squash hazard SYS-1246 closes).\n- Recognition reads the commits; titles and labels never grant the merge path. Checks, approvals, and protections unchanged — nothing is loosened.\n\n## Validation\n\n- YAML parses (deno std yaml); the existing check/merge conditions are preserved verbatim (additions only).\n- The PR's own Mergify configuration check validates this file.\n- Org policy + audit: systemfsoftware/.github#6, tracked on SYS-1246.