diff --git a/lib/git.zsh b/lib/git.zsh
index c79cc0d8..648a766b 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -76,9 +76,8 @@ function git_current_branch() {
 
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
-  if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then
-    local COMMITS
-    COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
+  if $(command git rev-parse --git-dir > /dev/null 2>&1); then
+    local COMMITS="$(git rev-list --count @{upstream}..HEAD)"
     echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
   fi
 }