Repository navigation
feat(handoff): add --base to stack a desk branch on a parent branch - #24
Merged
Merged
Conversation
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.
What
handoff-spawn --branch <name> ... --base <branch>cuts the new desk branch from<branch>instead of the default branch (wt switch --create --base). When Graphite is set up for the repo, the new branch is tracked with<branch>as its parent instead of trunk.--basewithout--branchis rejected, because headless stages run in an existing--worktree.Also documents the flag in
skills/handoff/SKILL.mdand the script's usage text.Why
Dependent issues need to stack on their parent's branch before the parent merges. Until now handoff-spawn could only cut desk branches from master, so a follow-up issue had to wait for its parent's PR to land (this is how the bercail-1lk desk was started on top of #23's branch).
Tests
tests/handoff_spawn_test.sh: new cases: with--base, gt tracks the new branch on that base;--basewithout--branchis refused and the flag is in--help. 33 PASS.for t in tests/*.sh; do bash "$t"; done: all 23 files pass after rebasing onto master (c6424de).