Merge branch 'theme-fix' of github.com:ogr3/bash-git-prompt into theme-fix

gitprompt.sh

@@ -1,7 +1,6 @@
 #!/bin/sh
 
-function async_run() 
-{
+function async_run() {
   {
     eval "$@" &> /dev/null
   }&
@@ -66,7 +65,6 @@ function get_theme() {
 }
 
 function git_prompt_load_theme() {
-  git_prompt_reset
   get_theme
   local DEFAULT_THEME_FILE="${__GIT_PROMPT_DIR}/themes/Default.bgptheme"
   source "${DEFAULT_THEME_FILE}"
@@ -180,7 +178,6 @@ git_prompt_reset() {
   for var in GIT_PROMPT_DIR __GIT_PROMPT_COLORS_FILE __PROMPT_COLORS_FILE __GIT_STATUS_CMD GIT_PROMPT_THEME_NAME; do
     unset $var
   done
-  unset -f prompt_callback
 }
 
 # gp_format_exit_status RETVAL
@@ -421,8 +418,7 @@ function checkUpstream() {
   fi
 }
 
-function replaceSymbols()
-{
+function replaceSymbols() {
   if [[ -z ${GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING} ]]; then
     GIT_PROMPT_SYMBOLS_NO_REMOTE_TRACKING=L
   fi