diff options
| author | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-11 17:14:35 +0200 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-11 17:14:35 +0200 |
| commit | f513999a4dbfea3a15287368848a718543fcaf7b (patch) | |
| tree | 3c403d8185cc65d977d57f82a9af768f33ad7f27 | |
| parent | 6ff96dab36865ab208b08a004903338bfd405eac (diff) | |
| download | zsh-f513999a4dbfea3a15287368848a718543fcaf7b.tar.gz zsh-f513999a4dbfea3a15287368848a718543fcaf7b.tar.bz2 zsh-f513999a4dbfea3a15287368848a718543fcaf7b.zip | |
git plugin: make b local in gg* functions
because it leaked, and led to #3991
| -rw-r--r-- | plugins/git/git.plugin.zsh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 7db43351a..dec787a8c 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -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 @@ -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 |