Skip to content

ci: reject branches built on unrelated history - #3

Merged
hootandy321 merged 2 commits into
mainfrom
ci/history-guard
Oct 15, 2026
Merged

hootandy321 merged 2 commits into
mainfrom
ci/history-guard

Conversation

@hootandy321

@hootandy321 hootandy321 commented Sep 30, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Adds a History guard workflow that fails a pull request (or a push to main) if its history contains any root commit other than this repository's root 05d6037. A branch built on unrelated history cannot then be merged by accident; it has to be rebuilt on main (for example by cherry-picking).

Same check as the EmbodiRun integration. To make it blocking, add Single root commit as a required status check for main.

Branch update (merge of main)

Merged current main into this branch so the required Commit policy check reports on this PR (the workflow arrives with the merge), and re-signed the commits per the DCO requirement. The history guard itself is unchanged and the branch still has the single expected root.

@hootandy321 hootandy321 self-assigned this Oct 14, 2026
The repository has a single root commit. Fail pull requests and main pushes
whose history contains any other root, so a branch derived from a different
repository's history cannot be merged by accident; such a branch has to be
rebuilt on main, for example by cherry-picking.

To make it blocking, add "Single root commit" as a required status check for
main, alongside the Commit policy check.

Signed-off-by: hootandy321 <133196559+hootandy321@users.noreply.github.com>
Bring the commit-policy workflow and the current main tree onto the
history-guard branch so the required Commit policy check reports on this
pull request instead of waiting forever, and re-validate the branch
against the latest code.

Signed-off-by: hootandy321 <133196559+hootandy321@users.noreply.github.com>
@hootandy321
hootandy321 merged commit 2cd9a37 into main Oct 15, 2026
6 checks passed
@hootandy321
hootandy321 deleted the ci/history-guard branch October 15, 2026 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants