Skip to content

Commit

Permalink
git plugin: make b local in gg* functions
Browse files Browse the repository at this point in the history
because it leaked, and led to ohmyzsh#3991
  • Loading branch information
ncanceill authored and DennisDenuto committed Oct 29, 2016
1 parent 70c7c14 commit 644ccf9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions plugins/git/git.plugin.zsh
Expand Up @@ -94,19 +94,19 @@ alias gfo='git fetch origin'
alias gg='git gui citool'
alias gga='git gui citool --amend'
ggf() {
[[ "$#" != 1 ]] && b="$(current_branch)"
[[ "$#" != 1 ]] && local b="$(current_branch)"
git push --force origin "${b:=$1}"
}
compdef _git ggf=git-checkout
ggl() {
[[ "$#" != 1 ]] && b="$(current_branch)"
[[ "$#" != 1 ]] && local b="$(current_branch)"
git pull origin "${b:=$1}"
}
compdef _git ggl=git-checkout
alias ggpull='ggl'
compdef _git ggpull=git-checkout
ggp() {
[[ "$#" != 1 ]] && b="$(current_branch)"
[[ "$#" != 1 ]] && local b="$(current_branch)"
git push origin "${b:=$1}"
}
compdef _git ggp=git-checkout
Expand All @@ -118,7 +118,7 @@ ggl "$1" && ggp "$1"
compdef _git ggpnp=git-checkout
alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'
ggu() {
[[ "$#" != 1 ]] && b="$(current_branch)"
[[ "$#" != 1 ]] && local b="$(current_branch)"
git pull --rebase origin "${b:=$1}"
}
compdef _git ggu=git-checkout
Expand Down

0 comments on commit 644ccf9

Please sign in to comment.