Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #38

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fixes #38

wants to merge 2 commits into from

Conversation

rbmarliere
Copy link

  • Add a few debug lines
  • Add a new current_branch() so ambiguos refs won't be a problem if the user chooses to delete a branch after deleting a tree
  • Don't use refname:short in has_branch because ambiguous short names are prepended by "heads/" in git branch (e.g. if there's a branch with the same name of a tag)

@rbmarliere
fix: Don't use short refname in has_branch()
7fdac5e 
If there is a tag with the same name, git will prepend "heads/" to the
branch name.
@rbmarliere
fix: Use new current_branch() in worktree deletion
42a9081 
Using rev-parse is not fail proof when dealing with ambiguous ref names.
@rbmarliere rbmarliere mentioned this pull request Dec 17, 2024
Merged
@rbmarliere rbmarliere force-pushed the fixes branch 2 times, most recently from 44ca009 to 42a9081 Compare December 27, 2024 14:58
@rbmarliere rbmarliere marked this pull request as draft December 27, 2024 16:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@rbmarliere