Merge branch 'tf/prompt-preserve-exit-status'

Using the exit status of the last command in the prompt, e.g.
PS1='$(__git_ps1) $? ', did not work well because the helper
function stomped on the exit status.

* tf/prompt-preserve-exit-status:
git-prompt: preserve value of $? inside shell prompt

diff --combined contrib/completion/git-prompt.sh
index 729f7694795d1116ccedfc653f82da757e6e4ef4,5fe69d046f96161a1c360a49480cd118642e98f3..3c3fc6d5d94c5dc6a9ec291fc217b590a11c5be3
--- 1/contrib/completion/git-prompt.sh
--- 2/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@@ -270,7 -270,7 +270,7 @@@ __git_ps1_colorize_gitstring (
  
  __git_eread ()
  {
 -      f="$1"
 +      local f="$1"
        shift
        test -r "$f" && read "$@" <"$f"
  }
@@@ -288,6 -288,7 +288,7 @@@
  # In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
  __git_ps1 ()
  {
+       local exit=$?
        local pcmode=no
        local detached=no
        local ps1pc_start='\u@\h:\w '
@@@ -511,4 -512,7 +512,7 @@@
        else
                printf -- "$printf_format" "$gitstring"
        fi
+ 
+       # preserve exit status
+       return $exit
  }