ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more helpers for git and tmux flow

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-09-16 14:52:07 -05:00
parent cc79b2a6b2
commit 8ae9c6ecda
6 changed files with 123 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/general/shell/branchd.func.sh
View file

@ -79,12 +79,22 @@ branchdel() {
if git -C "$repo_dir" worktree remove "$target_wt" 2>/dev/null; then
rm -rf -- "$target_wt" 2>/dev/null || true
echo "Removed worktree: $target_wt"
# delete local branch if it exists
if git -C "$repo_dir" show-ref --verify --quiet "refs/heads/$branch"; then
git -C "$repo_dir" branch -D "$branch" 2>/dev/null || true
echo "Deleted local branch: $branch"
fi
return 0
fi
# try with --force as a fallback
if git -C "$repo_dir" worktree remove --force "$target_wt" 2>/dev/null; then
rm -rf -- "$target_wt" 2>/dev/null || true
echo "Removed worktree (forced): $target_wt"
# delete local branch if it exists
if git -C "$repo_dir" show-ref --verify --quiet "refs/heads/$branch"; then
git -C "$repo_dir" branch -D "$branch" 2>/dev/null || true
echo "Deleted local branch: $branch"
fi
return 0
fi