diff options
| author |  Tony Finch <dot@dotat.at> | 2015-01-14 10:06:28 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-01-14 10:11:49 -0800 |
| commit | 6babe76496db332d589c1a2e0a2344fe41ca1dd5 (patch) | |
| tree | 1e1e71a65a6182d284e45b9480603c0ad41caf38 /contrib | |
| parent | git-prompt: preserve value of $? inside shell prompt (diff) | |
| download | tgif-6babe76496db332d589c1a2e0a2344fe41ca1dd5.tar.xz | |
git-prompt: preserve value of $? in all cases
Signed-off-by: Tony Finch <dot@dotat.at>
Reviewed-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 5fe69d046f..3a11f4e97d 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 () { + # preserve exit status local exit=$? local pcmode=no local detached=no @@ -303,7 +304,7 @@ __git_ps1 () ;; 0|1) printf_format="${1:-$printf_format}" ;; - *) return + *) return $exit ;; esac @@ -355,7 +356,7 @@ __git_ps1 () #In PC mode PS1 always needs to be set PS1="$ps1pc_start$ps1pc_end" fi - return + return $exit fi local short_sha @@ -416,7 +417,7 @@ __git_ps1 () if [ $pcmode = yes ]; then PS1="$ps1pc_start$ps1pc_end" fi - return + return $exit fi # is it a symbolic ref? b="${head#ref: }" @@ -513,6 +514,5 @@ __git_ps1 () printf -- "$printf_format" "$gitstring" fi - # preserve exit status return $exit } |