Merge branch 'master' into feature/stash_indicator

Conflicts:
	prompt.bash
	test

1 files changed, 8 insertions, 3 deletions

diff --git a/prompt.zsh b/prompt.zsh
index cb1eb91..2d31820 100755
--- a/prompt.zsh
+++ b/prompt.zsh
@@ -1,14 +1,19 @@
 #! /usr/bin/env zsh
 
 dot="$(cd "$(dirname "$0")"; pwd)"
+args=$@
 source "$dot/radar-base.sh"
 
 if is_repo; then
   autoload colors && colors
+
+  prepare_zsh_colors
   printf '%s' "%{$fg_bold[black]%} git:(%{$reset_color%}"
-  zsh_color_remote_commits
+  if show_remote_status $args; then
+    color_remote_commits
+  fi
   readable_branch_name
-  zsh_color_local_commits
+  color_local_commits
   printf '%s' "%{$fg_bold[black]%})%{$reset_color%}"
-  zsh_color_changes_status
+  color_changes_status
 fi