adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git plugin: make b local in gg* functions

Browse Source 
because it leaked, and led to #3991
This commit is contained in:
ncanceill 2015-06-11 17:14:35 +02:00
parent 6ff96dab36
commit f513999a4d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/git/git.plugin.zsh
View File

@ -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"
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