Postpone export of GIT_UPSTREAM until we know that it should be exported

9 years ago · 46aaea2c33
parent 230717084b
commit 46aaea2c33
1 changed files with 3 additions and 2 deletions
--- a/gitprompt.sh
+++ b/gitprompt.sh
@ -496,10 +496,11 @@ function updatePrompt() {
    unset GIT_REMOTE
  fi

-  export GIT_UPSTREAM="${git_status_fields[2]}"
-  if [[ -z "${__GIT_PROMPT_SHOW_UPSTREAM}" || "^" == "$GIT_UPSTREAM" ]]; then
+  local GIT_UPSTREAM_PRIVATE="${git_status_fields[2]}"
+  if [[ -z "${__GIT_PROMPT_SHOW_UPSTREAM}" || "^" == "$GIT_UPSTREAM_PRIVATE" ]]; then
    unset GIT_UPSTREAM
  else
+    export GIT_UPSTREAM=${GIT_UPSTREAM_PRIVATE}
    local GIT_FORMATTED_UPSTREAM="${GIT_PROMPT_UPSTREAM//_UPSTREAM_/\$GIT_UPSTREAM}"
  fi