git: output nothing when no commits ahead or behind

This fixes old git_commits_ahead behavior and changes git_commits_behind to have the same behavior. Fixes #5355

git: output nothing when no commits ahead or behind
71201ffd · Marc Cornellà · 298b6351 · 71201ffd
Commit 71201ffd authored Sep 05, 2016 by Marc Cornellà
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

git.zsh lib/git.zsh +10 -5

No files found.
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -76,16 +76,21 @@ function git_current_branch() {
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
-  if $(command git rev-parse --git-dir > /dev/null 2>&1); then
+  if command git rev-parse --git-dir &>/dev/null; then
-    local COMMITS="$(git rev-list --count @{upstream}..HEAD)"
+    local commits="$(git rev-list --count @{upstream}..HEAD)"
-    echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$COMMITS$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
+    if [[ "$commits" != 0 ]]; then
+      echo "$ZSH_THEME_GIT_COMMITS_AHEAD_PREFIX$commits$ZSH_THEME_GIT_COMMITS_AHEAD_SUFFIX"
+    fi
  fi
 }
 # Gets the number of commits behind remote
 function git_commits_behind() {
-  if $(command git rev-parse --git-dir > /dev/null 2>&1); then
+  if command git rev-parse --git-dir &>/dev/null; then
-    echo $(git rev-list --count HEAD..@{upstream})
+    local commits="$(git rev-list --count HEAD..@{upstream})"
+    if [[ "$commits" != 0 ]]; then
+      echo "$ZSH_THEME_GIT_COMMITS_BEHIND_PREFIX$commits$ZSH_THEME_GIT_COMMITS_BEHIND_SUFFIX"
+    fi
  fi
 }