Tom Boucher 17bb9f8a25 fix(worktree): use reset --hard in worktree_branch_check to correctly set base (#2015) (#2028) ...

The worktree_branch_check in execute-phase.md and quick.md used
git reset --soft as the fallback when EnterWorktree created a branch
from main/master instead of the current feature branch HEAD. --soft
moves the HEAD pointer but leaves working tree files from main unchanged,
so the executor worked against stale code and produced commits containing
the entire feature branch diff as deletions.

Fix: replace git reset --soft with git reset --hard in both workflow files.
--hard resets both the HEAD pointer and the working tree to the expected
base commit. It is safe in a fresh worktree that has no user changes.

Adds 4 regression tests (2 per workflow) verifying that the check uses
--hard and does not contain --soft.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

2026-04-10 12:07:13 -04:00

3.3 KiB

Raw Blame History

View Raw