chore(sync): merge main into next after hotfix #572 (#571) - #573
Merged
Merged
Conversation
Promotes the reviewed next candidate with preserved ancestry.
Promotes the reviewed next candidate with preserved ancestry.
Promotes the reviewed next candidate with preserved ancestry.
Promotes the reviewed next candidate with preserved ancestry.
Promotes the reviewed next candidate with preserved ancestry.
Dependabot security updates always target the default branch, so the main source guard rejected every one of them. Move the decision into scripts/main-branch-guard.zsh and also allow a same-repository dependabot/* branch whose pull-request author is dependabot[bot]. The workflow checks out only that script from the base branch, so it never runs pull-request code, and needs contents: read for that. The new Main Branch Guard job runs tests/main-branch-guard.zsh.
ss-o
commented
Sep 27, 2026
ss-o
left a comment
ss-o
left a comment
Member
Author
There was a problem hiding this comment.
Self-review of head 6abfbab.
No findings. The branch is next at 7d9feb8 plus one signed merge of main at 4f2c0a7, with no conflict resolution. git diff origin/next HEAD is exactly the five files of #572, byte for byte what main carries. tests/main-branch-guard.zsh passes on this head.
This must merge with a merge commit, not squash, so main becomes an ancestor of next; check git merge-base --is-ancestor origin/main origin/next afterwards.
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
1 participant
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.
Description
Synchronize hotfix #572 from
mainintonext, as the branch model requires before ordinary development continues (z-shell/.githubrunbooks/branch-protection.md, "Hotfix synchronization").The branch starts at
next(7d9feb8) and adds one signed merge commit ofmain(4f2c0a7). The merge was clean: the diff againstnextis exactly the five files from #572, and it also brings the earlier promotion merge commits onmainintonext's ancestry, which is expected.Merge this with a merge commit so the synchronization merge is preserved. After merge,
git merge-base --is-ancestor origin/main origin/nextmust succeed.Related issues
Refs #571
Type of change
fix- bug fix (non-breaking)feat- new feature (non-breaking)feat!/fix!- breaking changeperf- performance improvementrefactor- code change with no functional impactdocs- documentation onlytest- test addition or correctionbuild- build system or dependency changeci- CI/workflow changestyle- formatting with no behavior changechore- maintenance / dependency bumprevert- revert of an earlier changeChecklist
next; only same-repository hotfixes targetmainnexttomainpromotion uses a merge commit and records both parent SHAs (not a promotion)Co-authored-bytrailer credits a real human, never a bot, AI agent, or automationzsh -n zi.zsh/ Trunk checks)Verification
git diff --stat origin/next HEADlists only the five files from ci(guard): accept Dependabot security updates into main (#571) #572.6abfbabis signed, with parents7d9feb8(next) and4f2c0a7(main).zsh -f tests/main-branch-guard.zsh: passed.