Skip to content

GitLab

Commit f513999a authored by ncanceill's avatar ncanceill
Browse files

git plugin: make b local in gg* functions 

because it leaked, and led to #3991
parent 6ff96dab
Show whitespace changes
Inline Side-by-side
plugins/git/git.plugin.zsh
View file @ f513999a
...@@ -94,19 +94,19 @@ alias gfo='git fetch origin' ...@@ -94,19 +94,19 @@ alias gfo='git fetch origin'
alias gg='git gui citool' alias gg='git gui citool'
alias gga='git gui citool --amend' alias gga='git gui citool --amend'
ggf() { ggf() {
[[ "$#" != 1 ]] && b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(current_branch)"
git push --force origin "${b:=$1}" git push --force origin "${b:=$1}"
} }
compdef _git ggf=git-checkout compdef _git ggf=git-checkout
ggl() { ggl() {
[[ "$#" != 1 ]] && b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(current_branch)"
git pull origin "${b:=$1}" git pull origin "${b:=$1}"
} }
compdef _git ggl=git-checkout compdef _git ggl=git-checkout
alias ggpull='ggl' alias ggpull='ggl'
compdef _git ggpull=git-checkout compdef _git ggpull=git-checkout
ggp() { ggp() {
[[ "$#" != 1 ]] && b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(current_branch)"
git push origin "${b:=$1}" git push origin "${b:=$1}"
} }
compdef _git ggp=git-checkout compdef _git ggp=git-checkout
...@@ -118,7 +118,7 @@ ggl "$1" && ggp "$1" ...@@ -118,7 +118,7 @@ ggl "$1" && ggp "$1"
compdef _git ggpnp=git-checkout compdef _git ggpnp=git-checkout
alias ggsup='git branch --set-upstream-to=origin/$(current_branch)' alias ggsup='git branch --set-upstream-to=origin/$(current_branch)'
ggu() { ggu() {
[[ "$#" != 1 ]] && b="$(current_branch)" [[ "$#" != 1 ]] && local b="$(current_branch)"
git pull --rebase origin "${b:=$1}" git pull --rebase origin "${b:=$1}"
} }
compdef _git ggu=git-checkout compdef _git ggu=git-checkout
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment