From baa54d3673bba5582ce4436697223df9771493e1 Mon Sep 17 00:00:00 2001
From: oGre <oGre@muppfarmen.se>
Date: Thu, 8 Oct 2015 17:30:43 +0200
Subject: [PATCH] Added config variable analogue to GIT_PROMPT_VIRTUALENV

---
 gitprompt.sh            | 10 +++++-----
 themes/Default.bgptheme |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gitprompt.sh b/gitprompt.sh
index b880e35..d76987b 100755
--- a/gitprompt.sh
+++ b/gitprompt.sh
@@ -418,7 +418,7 @@ function replaceSymbols() {
 
   local VALUE=${1//_AHEAD_/${GIT_PROMPT_SYMBOLS_AHEAD}}
   local VALUE1=${VALUE//_BEHIND_/${GIT_PROMPT_SYMBOLS_BEHIND}}
-  local VALUE2=${VALUE1//_NO_REMOTE_TRACKING_/"{${GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING}}"}
+  local VALUE2=${VALUE1//_NO_REMOTE_TRACKING_/${GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING}}
 
   echo ${VALUE2//_PREHASH_/${GIT_PROMPT_SYMBOLS_PREHASH}}
 }
@@ -434,7 +434,7 @@ function updatePrompt() {
   git_prompt_config
 
   export __GIT_PROMPT_IGNORE_STASH=${GIT_PROMPT_IGNORE_STASH}
-  export __GIT_PROMPT_IGNORE_UPSTREAM=${GIT_PROMPT_IGNORE_UPSTREAM}
+  export __GIT_PROMPT_SHOW_UPSTREAM=${GIT_PROMPT_SHOW_UPSTREAM}
   local -a git_status_fields
   git_status_fields=($("$__GIT_STATUS_CMD" 2>/dev/null))
 
@@ -445,10 +445,10 @@ function updatePrompt() {
   fi
 
   local GIT_UPSTREAM="${git_status_fields[2]}"
-  if [[ -n "${__GIT_PROMPT_IGNORE_UPSTREAM}" || "^" == "$GIT_UPSTREAM" ]]; then
+  if [[ -z "${__GIT_PROMPT_SHOW_UPSTREAM}" || "^" == "$GIT_UPSTREAM" ]]; then
     unset GIT_UPSTREAM
   else
-    GIT_UPSTREAM=" ${Blue}{$GIT_UPSTREAM}${ResetColor}"
+    GIT_UPSTREAM="${GIT_PROMPT_UPSTREAM//_UPSTREAM_/${GIT_UPSTREAM}}"
   fi
 
   local GIT_STAGED=${git_status_fields[3]}
@@ -490,7 +490,7 @@ function updatePrompt() {
       eval "STATUS=\"$STATUS$1\""
     }
 
-    __chk_gitvar_status 'UPSTREAM'   '-n'
+    __add_status        '$GIT_UPSTREAM'
     __chk_gitvar_status 'REMOTE'     '-n'
     __add_status        "$GIT_PROMPT_SEPARATOR"
     __chk_gitvar_status 'STAGED'     '-ne 0'
diff --git a/themes/Default.bgptheme b/themes/Default.bgptheme
index b37b0e3..4e8e6b1 100644
--- a/themes/Default.bgptheme
+++ b/themes/Default.bgptheme
@@ -64,6 +64,8 @@ define_undefined_git_prompt_colors() {
   # use the placeholder _VIRTUALENV_ will be replaced with 
   # the name of the current virtual environment (currently CONDA and VIRTUAL_ENV)
   if [[ -z ${GIT_PROMPT_VIRTUALENV} ]]; then GIT_PROMPT_VIRTUALENV="(${Blue}_VIRTUALENV_${ResetColor}) "; fi
+
+  if [[ -z ${GIT_PROMPT_UPSTREAM} ]]; then GIT_PROMPT_UPSTREAM=" {${Blue}_UPSTREAM_${ResetColor}}"; fi
   
   # _LAST_COMMAND_INDICATOR_ will be replaced by the appropriate GIT_PROMPT_COMMAND_OK OR GIT_PROMPT_COMMAND_FAIL
   if [[ -z ${GIT_PROMPT_START_USER} ]]; then GIT_PROMPT_START_USER="_LAST_COMMAND_INDICATOR_ ${Yellow}${PathShort}${ResetColor}"; fi