diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 14:38:16 -0700 |
| commit | c9cae1e28a050f115d7591ce1a68674c2067b54b (patch) | |
| tree | fba2d3e25ade64bef99f0093a8078c751eb12e84 /contrib/completion | |
| parent | Merge branch 'tg/maint-zsh-svn-remote-prompt' into maint (diff) | |
| parent | prompt: fix for simple rebase (diff) | |
| download | tgif-c9cae1e28a050f115d7591ce1a68674c2067b54b.tar.xz | |
Merge branch 'fc/show-branch-in-rebase-am' into maint
* fc/show-branch-in-rebase-am:
prompt: fix for simple rebase
Diffstat (limited to 'contrib/completion')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index b6b1534c02..54e48299ae 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -280,6 +280,7 @@ __git_ps1 () step=$(cat "$g/rebase-apply/next") total=$(cat "$g/rebase-apply/last") if [ -f "$g/rebase-apply/rebasing" ]; then + b="$(cat "$g/rebase-apply/head-name")" r="|REBASE" elif [ -f "$g/rebase-apply/applying" ]; then r="|AM" @@ -296,6 +297,7 @@ __git_ps1 () r="|BISECTING" fi + test -n "$b" || b="$(git symbolic-ref HEAD 2>/dev/null)" || { detached=yes b="$( |