Updated git_commits_ahead function (#5247)

* Function wasn't returning correct value * Updated underlying git command * Kept echo command from previous function for backwards compatibility * Kept function consistent with git_commits_behind

Updated git_commits_ahead function (#5247)
61981951 · Steven · Marc Cornellà · a7e30b26 · 61981951
Commit 61981951 authored Aug 01, 2016 by Steven Committed by Marc Cornellà Aug 01, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

git.zsh lib/git.zsh +2 -3

No files found.
--- 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
+  if $(command git rev-parse --git-dir > /dev/null 2>&1); then
-    local COMMITS
+    local COMMITS="$(git rev-list --count @{upstream}..HEAD)"
-    COMMITS=$(command git log @{upstream}..HEAD | grep '^commit' | wc -l | tr -d ' ')
    echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
  fi
 }