From 6b34237bae21973c0672a33ab977ddbdeb188a37 Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Fri, 3 Jan 2025 10:32:28 -0500 Subject: [PATCH] refactor(git): improve branch parsing logic Refactor the logic used to determine local branches considered 'gone' in custom Git commands. Ensure proper handling of branches that are checked out in worktrees. --- .gitconfig##template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitconfig##template b/.gitconfig##template index 12014f1..6c7cca3 100644 --- a/.gitconfig##template +++ b/.gitconfig##template @@ -44,9 +44,9 @@ dlb = "dead-local-branches" ddlb = "delete-dead-local-branches" fdlb = "force-delete-dead-local-branches" - dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ print $1; }'" - delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ print $1; }' | xargs -r git branch -d" - force-delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ print $1; }' | xargs -r git branch -D" + dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }'" + delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -d" + force-delete-dead-local-branches = "!git branch -vv | grep ': gone]'| grep -v '\\*' | awk '{ if ($1 == \"+\") print $2; else print $1; }' | xargs -r git branch -D" [init] defaultBranch = main