Repository navigation
Keep a local-only manifest off every branch but the integration branch - #106
Merged
Merged
Conversation
With syncwheel_tracking: local-only, every integration rebuild still wrote a manifest-only control commit onto the integration branch, staging .syncwheel/manifest.json, and several publish paths could push it anywhere, including the canonical remote's base branch. The commit also copied the parent's author and committer, so it was attributed to whoever wrote the previous commit. A local-only repository without active coordination no longer gets the control commit: the planner treats an integration tree without the manifest as converged, a legacy control commit is dropped on the next rebuild, and the manifest file is kept byte-identical through the reset wherever it lives. Coordinated local-only repositories keep the control commit, which the protocol reads back from the published tip. Every Syncwheel push goes through run_authorized_push, which now refuses to send a tree carrying a local-only control manifest anywhere except the integration branch (when it is not the canonical remote's base branch) and Syncwheel coordination refs. The canonical remote is recognized by its normalized push URL, not by remote name. Control commits in git-tracked repositories use a fixed Syncwheel Control identity with the parent's commit time and a pinned commit encoding, so every clone still computes the same SHA without borrowing a person's name. Control tips and pending intents written by earlier versions are still recognized.
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.
Summary
With
syncwheel_tracking: local-only, every integration rebuild still wrote a manifest-only control commit onto the integration branch and staged.syncwheel/manifest.json, and several publish paths could push it anywhere — including the canonical remote's base branch, for example when the integration branch shares the base branch's name or when a second remote name points at the canonical URL. The commit also copied the parent's author and committer, so it was attributed to whoever wrote the previous commit.-Mand-ppaths), and the protective step is printed in--dry-runtranscripts too. Coordinated local-only repositories keep the control commit, which the protocol reads back from the published tip.run_authorized_push, which now refuses to send a tree carrying a local-only control manifest anywhere except the integration branch (when it is not the canonical remote's base branch) and Syncwheel coordination refs. The canonical remote is recognized by its normalized push URL, not by remote name.stack land,stack push, reconcile,int push, publish, channel publish and coordination repair are all covered by construction.Syncwheel Control <control@syncwheel.invalid>with the parent's commit time, a pinned commit encoding and a clearedGIT_CONFIG_PARAMETERS, so every clone still computes the same SHA without borrowing a person's name. Control tips and pending intents written by earlier versions are still recognized and recovered. Published control tips change SHA once: upgrade all clones together.--force-with-leaseis passed through unchanged.Version 0.44.0.
Test plan
scripts/check-version-bump.py --base origin/main,docs/sync_version.py --check