feat: add 'Remove worktree and branch' option when deleting a branch checked out by a worktree#5557
Open
toller892 wants to merge 1 commit intojesseduffield:masterfrom
Open
Conversation
…checked out by a worktree When deleting a branch that is currently checked out by a worktree, users previously had to remove the worktree first, then delete the branch in a second step. This adds a new menu option that combines both operations into a single action. Closes jesseduffield#5205
|
Don't think we need an extra option. Just update the existing |
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
2 participants
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.
Description
When deleting a branch that is currently checked out by a worktree, users currently have three options:
If the user wants to delete BOTH the worktree and the branch, they must first remove the worktree, then delete the branch in a second step. This adds a fourth option that combines both operations.
Closes #5205
Changes
RemoveWorktreeAndBranchi18n stringpromptWorktreeBranchDelete()that callsworktreeHelper.Remove()followed byBranch.LocalDelete()Testing
go build ./...✅go test ./pkg/i18n/ ./pkg/gui/controllers/helpers/✅