From 806889d155a7b21bf5ccef84786a80bb4b78a6a7 Mon Sep 17 00:00:00 2001
From: Ilya Kantor <iliakan@users.noreply.github.com>
Date: Sat, 22 Jul 2017 23:51:58 +0200
Subject: [PATCH] Add separator to status only if something follow it

---
 gitprompt.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index b85da60..537f937 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -551,13 +551,15 @@ function updatePrompt() {
     }
 
     __chk_gitvar_status 'REMOTE'     '-n'
-    __add_status        "$GIT_PROMPT_SEPARATOR"
-    __chk_gitvar_status 'STAGED'     '-ne 0'
-    __chk_gitvar_status 'CONFLICTS'  '-ne 0'
-    __chk_gitvar_status 'CHANGED'    '-ne 0'
-    __chk_gitvar_status 'UNTRACKED'  '-ne 0'
-    __chk_gitvar_status 'STASHED'    '-ne 0'
-    __chk_gitvar_status 'CLEAN'      '-eq 1'   -
+    if [[ $GIT_CLEAN -eq 0 ]] || [[ $GIT_PROMPT_CLEAN != "" ]]; then
+      __add_status        "$GIT_PROMPT_SEPARATOR"
+      __chk_gitvar_status 'STAGED'     '-ne 0'
+      __chk_gitvar_status 'CONFLICTS'  '-ne 0'
+      __chk_gitvar_status 'CHANGED'    '-ne 0'
+      __chk_gitvar_status 'UNTRACKED'  '-ne 0'
+      __chk_gitvar_status 'STASHED'    '-ne 0'
+      __chk_gitvar_status 'CLEAN'      '-eq 1'   -
+    fi
     __add_status        "$ResetColor$GIT_PROMPT_SUFFIX"
 
     NEW_PROMPT="$(gp_add_virtualenv_to_prompt)$PROMPT_START$($prompt_callback)$STATUS_PREFIX$STATUS$PROMPT_END"