git-prompt: preserve value of $? inside shell prompt

If you have a prompt which displays the command exit status, __git_ps1 without this change corrupts it, although it has the correct value in the parent shell: ~/src/git (master) 0 $ set | grep ^PS1 PS1='\w$(__git_ps1) $? \$ ' ~/src/git (master) 0 $ false ~/src/git (master) 0 $ echo $? 1 ~/src/git (master) 0 $ There is a slightly ugly workaround: ~/src/git (master) 0 $ set | grep ^PS1 PS1='\w$(x=$?; __git_ps1; exit $x) $? \$ ' ~/src/git (master) 0 $ false ~/src/git (master) 1 $ This change makes the workaround unnecessary. Signed-off-by: Tony Finch <dot@dotat.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Tony Finch committed Dec 22, 2014 at 18:09 UTC eb443e3b39482b3d64c1efd46de7481c3321a87a
1 file changed +4
contrib/completion/git-prompt.sh
+4
@@ -288,6 +288,7 @@ __git_eread ()
288 # In this mode you can request colored hints using GIT_PS1_SHOWCOLORHINTS=true
289 __git_ps1 ()
290 {
291 + local exit=$?
292 local pcmode=no
293 local detached=no
294 local ps1pc_start='\u@\h:\w '
@@ -511,4 +512,7 @@ __git_ps1 ()
512 else
513 printf -- "$printf_format" "$gitstring"
514 fi
515 +
516 + # preserve exit status
517 + return $exit
518 }