Skip to content

fix(core): refuse rewriting commits owned by a parent workspace - #707

Merged
Ziinc merged 2 commits into
mainfrom
ccr-b84e8000-3ab84a-target-branch-guard
Oct 3, 2026
Merged

Ziinc merged 2 commits into
mainfrom
ccr-b84e8000-3ab84a-target-branch-guard

Conversation

@Ziinc

@Ziinc Ziinc commented Oct 3, 2026 •

Copy link
Copy Markdown
Collaborator
  • The shared rewrite guard now also rejects commits reachable from the workspace's own target branch, so a workspace stacked on another workspace's bookmark can no longer rewrite the parent's commits. The error names the parent branch.
  • Abandon, describe, move, stash, undo and timestamp shift (plus move-changes for commits) all go through the guard; move's ad-hoc second check is removed. A parent bookmark that no longer resolves blocks nothing.
  • Adds one integration test per operation, each asserting rejection and an unchanged parent history.
    🤖 Generated with Claude Code
    https://claude.ai/code/session_01MxqTt1WtVRKkjNXQpgkJS9
    Generated by Claude Code

A workspace stacked on another workspace's bookmark has the parent's
commits in its ::@. The shared rewrite guard now also rejects commits
reachable from the workspace's own target branch, and abandon, describe,
move, stash, undo, timestamp shift and move-changes all go through it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MxqTt1WtVRKkjNXQpgkJS9
…branch commit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MxqTt1WtVRKkjNXQpgkJS9
@Ziinc
Ziinc merged commit 4672861 into main Oct 3, 2026
22 checks passed
@Ziinc
Ziinc deleted the ccr-b84e8000-3ab84a-target-branch-guard branch October 3, 2026 22:02

This branch was successfully deployed

1 active deployment
preview — fdac3caf Deployed Oct 3, 2026 by Ziinc via build #1681
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