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

git plugin: fix ggpnp when called without argument

Browse Source 
also allow multiple arguments for ggp and ggl aliases
This commit is contained in:
ncanceill 2015-06-11 23:34:18 +02:00
parent f513999a4d
commit 8eb31a6f9a
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,21 +99,29 @@ git push --force origin "${b:=$1}"
} }
compdef _git ggf=git-checkout compdef _git ggf=git-checkout
ggl() { ggl() {
[[ "$#" != 1 ]] && local b="$(current_branch)" [[ "$#" == 0 ]] && local b="$(current_branch)"
git pull origin "${b:=$1}" git pull origin "${b:=$1}" "${*[2,-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 ]] && local b="$(current_branch)" if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
git push origin "${*}"
else
[[ "$#" == 0 ]] && local b="$(current_branch)"
git push origin "${b:=$1}" git push origin "${b:=$1}"
fi
} }
compdef _git ggp=git-checkout compdef _git ggp=git-checkout
alias ggpush='ggp' alias ggpush='ggp'
compdef _git ggpush=git-checkout compdef _git ggpush=git-checkout
ggpnp() { ggpnp() {
ggl "$1" && ggp "$1" if [[ "$#" == 0 ]]; then
ggl && ggp
else
ggl "${*}" && ggp "${*}"
fi
} }
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)'