summaryrefslogtreecommitdiff
path: root/plugins/github/github.plugin.zsh
diff options
context:
space:
mode:
authorSébastien M-B <essembeh@gmail.com>2012-04-12 19:28:59 +0200
committerSébastien M-B <essembeh@gmail.com>2012-04-12 19:28:59 +0200
commit741388be00fb88b7680e0faa328adf5a86e1f65f (patch)
tree5e53a65fcc71bc01c5f81b28fb5e54faaf3ab2a8 /plugins/github/github.plugin.zsh
parent37266112759a5759536cc4ea84ea063695cd1f2e (diff)
parent1120f973054836eeb53750f57d69fbec41a340dc (diff)
downloadzsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.gz
zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.tar.bz2
zsh-741388be00fb88b7680e0faa328adf5a86e1f65f.zip
Merge remote branch 'upstream/master'
Conflicts: lib/completion.zsh
Diffstat (limited to 'plugins/github/github.plugin.zsh')
-rw-r--r--plugins/github/github.plugin.zsh12
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/github/github.plugin.zsh b/plugins/github/github.plugin.zsh
index 9b0d54602..197e86a48 100644
--- a/plugins/github/github.plugin.zsh
+++ b/plugins/github/github.plugin.zsh
@@ -1,7 +1,17 @@
# Setup hub function for git, if it is available; http://github.com/defunkt/hub
if [ "$commands[(I)hub]" ] && [ "$commands[(I)ruby]" ]; then
# eval `hub alias -s zsh`
- function git(){hub "$@"}
+ function git(){
+ if ! (( $+_has_working_hub )); then
+ hub --version &> /dev/null
+ _has_working_hub=$(($? == 0))
+ fi
+ if (( $_has_working_hub )) ; then
+ hub "$@"
+ else
+ command git "$@"
+ fi
+ }
fi
# Functions #################################################################