Conversation
When a worktree has uncommitted changes and its remote branch is deleted, the prune phase now shows "⊘ dirty" (yellow) instead of incorrectly displaying "— pruned" with strikethrough or misleadingly showing "✓ up to date". Changes: - Add RemoveOutcome enum to distinguish dirty skip from other failures - Propagate skipped_dirty through the prune call chain - Add TaskMessage::SkippedDirty and FinalStatus::Dirty variants - Fix dangerous catch-all `_ => FinalStatus::Pruned` in prune status mapping (now defaults to UpToDate) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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.
Summary
RemoveOutcomeenum to distinguish dirty-skipped from other removal failures, propagated through the prune call chain via newskipped_dirtyfield_ => FinalStatus::Prunedin the prune status mapping (changed toUpToDate)Test plan
mise run fmt:checkpassesmise run clippypasses with zero warningsmise run test:unitpasses (638 tests, including newprune_skipped_dirty_sets_dirty_statustest)daft sync— verify "⊘ dirty" appears instead of "— pruned" or "✓ up to date"🤖 Generated with Claude Code