0c590aba74f28e94f03eb918c07a90cf1a51f525
- Author
- wl2776 <wl2776@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
fix(git): fix `gbda` alias when there are no merged branches (#10005)
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 522257d2dbb2db978351b6b0831eff8784bbbc4a..48cf8720404ff5b55291a1db9ac7847b6f59dcfc 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -23,7 +23,7 @@ plugins=(... git)
6 | gb | git branch |
7 | gba | git branch -a |
8 | gbd | git branch -d |
9-| gbda | git branch --no-color --merged \| command grep -vE "^(\+\|\*\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| command xargs -n 1 git branch -d |
10+| gbda | git branch --no-color --merged \| grep -vE "^([+*]\|\s*($(git_main_branch)\|$(git_develop_branch))\s*$)" \| xargs git branch -d 2>/dev/null |
11 | gbD | git branch -D |
12 | gbl | git blame -b -w |
13 | gbnm | git branch --no-merged |
14diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
15index 3cd55869245708281cb9e4cb4851fd0c4f90d3d3..f0d9aaedc8f8bd4682152c0dbff87d268c6e42e8 100644
16--- a/plugins/git/git.plugin.zsh
17+++ b/plugins/git/git.plugin.zsh
18@@ -73,7 +73,7 @@ alias gapt='git apply --3way'
19 alias gb='git branch'
20 alias gba='git branch -a'
21 alias gbd='git branch -d'
22-alias gbda='git branch --no-color --merged | command grep -vE "^(\+|\*|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs -n 1 git branch -d'
23+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
24 alias gbD='git branch -D'
25 alias gbl='git blame -b -w'
26 alias gbnm='git branch --no-merged'