0fabd5f22f4e0378b09c92607789fdb17cab3c20

Author
Francesco Ilario <filario@redhat.com>
Committer
GitHub <noreply@github.com>
Date

Message

fix(git): add checked-out branch support to `gbg*` (#12397)

Diff

 1diff --git a/plugins/git/README.md b/plugins/git/README.md
 2index 4c005ad2f91a4c03f837046f98436d5dfd53ec8e..4022f8c623b450221a9eeae921668b7e68cf9610 100644
 3--- a/plugins/git/README.md
 4+++ b/plugins/git/README.md
 5@@ -41,8 +41,8 @@ plugins=(... git)
 6 | `gba`                  | `git branch --all`                                                                                                              |
 7 | `gbd`                  | `git branch --delete`                                                                                                           |
 8 | `gbD`                  | `git branch --delete --force`                                                                                                   |
 9-| `gbgd`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| awk '"'"'{print $1}'"'"' \| xargs git branch -d`                        |
10-| `gbgD`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| awk '"'"'{print $1}'"'"' \| xargs git branch -D`                        |
11+| `gbgd`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -d`           |
12+| `gbgD`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -D`           |
13 | `gbm`                  | `git branch --move`                                                                                                             |
14 | `gbnm`                 | `git branch --no-merged`                                                                                                        |
15 | `gbr`                  | `git branch --remote`                                                                                                           |
16diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
17index 146f4a512504fb8394b6ada4e80dd550f8bc2b90..c48e365b5225f8064cac0916ebb45e2577d955e2 100644
18--- a/plugins/git/git.plugin.zsh
19+++ b/plugins/git/git.plugin.zsh
20@@ -147,8 +147,8 @@ function gbds() {
21     done
22 }
23 
24-alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d'
25-alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D'
26+alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -d'
27+alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -D'
28 alias gbm='git branch --move'
29 alias gbnm='git branch --no-merged'
30 alias gbr='git branch --remote'