fix: cd to safe directory when branch-delete removes current worktree#234
Merged
fix: cd to safe directory when branch-delete removes current worktree#234
Conversation
Two bugs prevented worktree-branch-delete from changing directory to a safe location when deleting the worktree the user is currently inside: 1. Shell wrapper (bash/zsh/fish) only checked DAFT_CD_FILE when exit code was 0. But branch-delete can exit non-zero due to partial errors (e.g., remote branch deletion failure) even after successfully removing the worktree. The user's CWD is gone but the wrapper skipped the cd. 2. Current-worktree detection relied solely on exact path string comparison between git rev-parse and git worktree list output. Added path canonicalization and branch name fallback for robustness. 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
DAFT_CD_FILEregardless of exit code — previously it only checked on success, so partial errors (e.g., remote branch deletion failure) would leave the user stranded in a deleted directorybranch_deletemore robust with path canonicalization and branch name fallback (matching the pattern used inprune)cdTarget=rootandcdTarget=default-branchTest plan
mise run fmt-check— passesmise run clippy— passesmise run test-unit— 333 passedgit worktree-branch-deletefrom inside worktree correctly cd's to safe directory🤖 Generated with Claude Code