umputun / ralphex / 32997623945

86%

Build Type

push

github

Committed by web-flow

Commit Message

fix: let worktree mode start with a dirty source checkout (#445)

* fix: let worktree mode start with a dirty source checkout

--worktree refused to start when the source checkout held any uncommitted
file other than the plan, so an unrelated scratch file blocked a run whose
whole point is that the main checkout stays in use.

The worktree never sees those files: git worktree add checks out a commit,
and only the selected plan is copied across. Downgrade the dirty list to a
warning in worktree mode and keep the hard error for in-place branch mode,
where the feature branch really is created in that same working tree.

Guard an unfinished merge, cherry-pick, revert, rebase, am or bisect
instead. That state cannot be inferred from the dirty list - once conflicts
are resolved and staged it looks like ordinary staged work - and it breaks
only at the end of the run, where the plan archive's pathspec commit against
the source checkout is refused outright.

Related to #444

* fix: refuse a plan archive that would overwrite an existing completed copy

Letting a dirty source checkout through made an existing data-loss path
reachable under --worktree. With a tracked docs/plans/<date>-foo.md and an
uncommitted docs/plans/completed/<date>-foo.md, git mv declines the existing
destination, the os.Rename fallback replaces it without a word, and the
overwritten file was never committed, so it is gone.

Lstat the destination immediately before that rename and return an error
naming both paths. lstat rather than stat so a symlink is the collision
rather than whatever it points at. The error reaches the caller's existing
warn-and-summarize path, so the run reports the archive as incomplete.

resolvePlanMoveTargets now returns done=true only when the source is gone
and a completed/ copy proves the plan archived. The alternate-basename
collision used to return done=true with a log line, which the caller reads
as archived - the same false success. It goes to the move path i... (continued)

Coverage Stats

50 of 56 new or added lines in 2 files covered. (89.29%)

5 existing lines in 2 files now uncovered.

8056 of 9403 relevant lines covered (85.67%)

225.44 hits per line