From 1a7ebf4da70b0fbcb6ec5d5e3da88f884c65d356 Mon Sep 17 00:00:00 2001
From: Ethan Edwards <ethan_edwards@snapkitchen.com>
Date: Mon, 30 Apr 2018 13:40:08 -0500
Subject: [PATCH] change to setting variables to empty value before use

---
 themes/base.theme.bash       | 6 +++++-
 themes/githelpers.theme.bash | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 2cc41643..12df1d8a 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -7,6 +7,8 @@ CLOCK_THEME_PROMPT_SUFFIX=''
 
 THEME_PROMPT_HOST='\H'
 
+SCM=
+
 SCM_CHECK=${SCM_CHECK:=true}
 
 SCM_THEME_PROMPT_DIRTY=' ✗'
@@ -64,6 +66,8 @@ THEME_SHOW_USER_HOST=${THEME_SHOW_USER_HOST:=false}
 USER_HOST_THEME_PROMPT_PREFIX=''
 USER_HOST_THEME_PROMPT_SUFFIX=''
 
+VIRTUAL_ENV=
+
 VIRTUALENV_THEME_PROMPT_PREFIX=' |'
 VIRTUALENV_THEME_PROMPT_SUFFIX='|'
 
@@ -122,7 +126,7 @@ function scm_prompt_info_common {
   SCM_DIRTY=0
   SCM_STATE=''
 
-  if [[ ${SCM:-} == ${SCM_GIT} ]]; then
+  if [[ ${SCM} == ${SCM_GIT} ]]; then
     if [[ ${SCM_GIT_SHOW_MINIMAL_INFO} == true ]]; then
       # user requests minimal git status information
       git_prompt_minimal_info
diff --git a/themes/githelpers.theme.bash b/themes/githelpers.theme.bash
index 66279faf..833e5190 100644
--- a/themes/githelpers.theme.bash
+++ b/themes/githelpers.theme.bash
@@ -71,7 +71,8 @@ function _git-hide-status {
 }
 
 function _git-status {
-  [[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && local git_status_flags='-uno'
+  local git_status_flags=
+  [[ "${SCM_GIT_IGNORE_UNTRACKED}" = "true" ]] && git_status_flags='-uno'
   git status --porcelain ${git_status_flags:-} 2> /dev/null
 }
 
@@ -102,7 +103,8 @@ function _git-status-counts {
 function _git-remote-info {
   [[ "$(_git-upstream)" == "" ]] && return
 
-  [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && local same_branch_name=true
+  local same_branch_name=
+  [[ "$(_git-branch)" == "$(_git-upstream-branch)" ]] && same_branch_name=true
   if ([[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "auto" ]] && [[ "$(_git-num-remotes)" -ge 2 ]]) ||
       [[ "${SCM_GIT_SHOW_REMOTE_INFO}" = "true" ]]; then
     if [[ "${same_branch_name}" != "true" ]]; then