From d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Wed, 17 Jun 2015 22:38:31 +0200 Subject: [PATCH] git plugin: fix ggl to avoid empty string see https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330 --- plugins/git/git.plugin.zsh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 168618760..cc6eb1031 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -101,8 +101,12 @@ git push --force origin "${b:=$1}" } compdef _git ggf=git-checkout ggl() { +if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then +git pull origin "${*}" +else [[ "$#" == 0 ]] && local b="$(current_branch)" -git pull origin "${b:=$1}" "${*[2,-1]}" +git pull origin "${b:=$1}" +fi } compdef _git ggl=git-checkout alias ggpull='git pull origin $(current_branch)'