c92af18c36c84cef0c785e1ae9cabc49a61a5c3a
- Author
- Zhang Visper <reg@zjy.name>
- Committer
- GitHub <noreply@github.com>
- Date
Message
fix(git): some aliases under non-english LANG (#11855)
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 0b757c4812f7685d4f9b5e821d1039291eef0c37..c3e6dd27daeaaefde47e8517e07fbfab8f89e083 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -40,12 +40,12 @@ plugins=(... git)
6 | gbd | git branch --delete |
7 | gbD | git branch --delete --force |
8 | gbda | git branch --no-color --merged | grep -vE "^([+]|\s($(git_main_branch)|$(git_develop_branch))\s\*$)" | xargs git branch --delete 2>/dev/null |
9-| gbgd | git branch --no-color -vv |
10-| gbgD | git branch --no-color -vv |
11+| gbgd | LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d |
12+| gbgD | LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D |
13 | gbnm | git branch --no-merged |
14 | gbr | git branch --remote |
15 | ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
16-| gbg | git branch -vv |
17+| gbg | LANG=C git branch -vv | grep ": gone\]" |
18 | gco | git checkout |
19 | gcor | git checkout --recurse-submodules |
20 | gcb | git checkout -b |
21diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
22index b321ce7b044c633c765cb48b05a359efb4f73316..8886aac6d7a0fa272c041d487a97f272523f0abd 100644
23--- a/plugins/git/git.plugin.zsh
24+++ b/plugins/git/git.plugin.zsh
25@@ -121,12 +121,12 @@ alias gba='git branch --all'
26 alias gbd='git branch --delete'
27 alias gbD='git branch --delete --force'
28 alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
29-alias gbgd='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d'
30-alias gbgD='git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D'
31+alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -d'
32+alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | awk '"'"'{print $1}'"'"' | xargs git branch -D'
33 alias gbnm='git branch --no-merged'
34 alias gbr='git branch --remote'
35 alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
36-alias gbg='git branch -vv | grep ": gone\]"'
37+alias gbg='LANG=C git branch -vv | grep ": gone\]"'
38 alias gco='git checkout'
39 alias gcor='git checkout --recurse-submodules'
40 alias gcb='git checkout -b'