diff options
| author | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-17 22:38:31 +0200 |
|---|---|---|
| committer | ncanceill <nicolas.canceill@ens-cachan.org> | 2015-06-17 22:38:31 +0200 |
| commit | d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3 (patch) | |
| tree | 2d256f6c8118173e8e9912c5704b49c11b9164a2 /plugins | |
| parent | ed6645a2823dc6c3e0fae822186d79542682e68e (diff) | |
| download | zsh-d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3.tar.gz zsh-d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3.tar.bz2 zsh-d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3.zip | |
git plugin: fix ggl to avoid empty string
see
https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 6 |
1 files changed, 5 insertions, 1 deletions
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)' |