fix: run git from mainRoot only if we deleted the current worktree#137
Merged
k1LoW merged 1 commit intok1LoW:mainfrom Feb 14, 2026
Merged
Conversation
If no upstream for the branch was set, git checks the target branch is fully merged in HEAD. Because HEAD depends on the current working directory and git-wt >= v0.11.0 always specifies "-C mainRoot" to git command, the branch deletion behavior of git-wt was different from the behavior of git branch -d. This change allows git-wt to specify "-C mainRoot" only if the current working tree is the one being deleted. It also ensures consistent behavior with deleting branches that have no worktree.
Merged
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
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 of the change
Run git from mainRoot only if we deleted the current worktree
If no upstream for the branch was set, git checks the target branch is fully merged in HEAD. Because HEAD depends on the current working directory and git-wt >= v0.11.0 always specifies "-C mainRoot" to git command, the branch deletion behavior of git-wt was different from the behavior of git branch -d.
This change allows git-wt to specify "-C mainRoot" only if the current working tree is the one being deleted.
It also ensures consistent behavior with deleting branches that have no worktree.
Problem to be solved
Try renaming the local branch and worktree by copying them and deleting the originals:
Since the target branch 'a' is at the same revision as the current branch 'b',
deleting the branch 'a' is expected to succeed.
Furthermore, this behavior is inconsistent with git-wt's behavior of deleting branches that are not associated with any worktree.
We can verify the latter by running the command again: