diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:09:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:09:35 -0800 |
| commit | 487b17de3ea1842b91a739cf31a08130faa03856 (patch) | |
| tree | 8ed3582f2ab4003c6b01d2d75a3e9a852e80d95f | |
| parent | Merge branch 'sb/dco-indentation-fix' (diff) | |
| parent | git-prompt: preserve value of $? inside shell prompt (diff) | |
| download | tgif-487b17de3ea1842b91a739cf31a08130faa03856.tar.xz | |
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
| -rw-r--r-- | contrib/completion/git-prompt.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 729f769479..3c3fc6d5d9 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -288,6 +288,7 @@ __git_eread () # 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 @@ __git_ps1 () else printf -- "$printf_format" "$gitstring" fi + + # preserve exit status + return $exit } |