fix(workflow): explicit wt-rm + wt-new --no-track (worktree-helper corrections) #43

Merged

oli merged 2 commits from fix/wt-rm-explicit-target into main 2026-06-23 22:42:02 +01:00

Conversation 0 Commits 2 Files Changed 7

+142 -96

2 Commits

Author	SHA1	Message	Date
claude@clouddev1	279ef98ab8	fix(workflow): wt-new branches with --no-track (no inherited origin/main upstream) ... Branching off origin/main set the new branch's upstream to origin/main, so a bare `git push` failed with a name-mismatch and suggested the dangerous `git push origin HEAD:main`. Add --no-track so the branch carries no upstream until the first `git push -u origin <branch>` sets the right one — keeping the fresh-from-origin/main base without the tracking side-effect. Add a test-wt.sh assertion that a new branch has no upstream, and note the behaviour + first-push form in ADR-0059 / CLAUDE.md.	2026-06-23 21:36:26 +00:00
claude@clouddev1	4570c4e1ea	fix(workflow): wt-rm removes only the named worktree (was auto-sweeping merged ones) ... The first wt-clean.sh removed every worktree whose branch was merged into origin/main — but long-lived branches (website, the ci line) are merged too, so it would have deleted their worktrees. Caught on review before any real use. Replace the auto-sweep with an explicit `wt-rm <branch>` that removes only the named worktree; safety comes from git's own refusals — it won't remove a dirty worktree (no --force) and deletes the local branch only when it's merged into origin/main, otherwise keeps it (and its unmerged commits). Update test-wt.sh to 15 checks (incl. "unnamed worktree untouched", primary refused, dirty refused, unmerged branch preserved) and the wt-clean references in ADR-0059 / CLAUDE.md / the README index.	2026-06-23 21:27:41 +00:00