diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index bb1978f78..e4e152a29 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -125,17 +125,23 @@ alias gsd='git svn dcommit'
 # Usage example: git pull origin $(current_branch)
 #
 function current_branch() {
-  if [ ! -d .git ]; then return; fi
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo ${ref#refs/heads/}
+  if [ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1; then
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+    echo ${ref#refs/heads/};
+  else
+    return;
+  fi
 }
 
 function current_repository() {
-  if [ ! -d .git ]; then return; fi
-  ref=$(git symbolic-ref HEAD 2> /dev/null) || \
-  ref=$(git rev-parse --short HEAD 2> /dev/null) || return
-  echo $(git remote -v | cut -d':' -f 2)
+  if [ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1; then
+    ref=$(git symbolic-ref HEAD 2> /dev/null) || \
+    ref=$(git rev-parse --short HEAD 2> /dev/null) || return
+    echo $(git remote -v | cut -d':' -f 2);
+  else
+    return;
+  fi
 }
 
 # these aliases take advantage of the previous function