Re: [PATCH] Improve bash prompt to detect merge / rebase in progress

[Junio C Hamano <gitster@pobox.com>]

Robin Rosenberg <robin.rosenberg@dewire.com> writes:

> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 5ed1821..1fef857 100755
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -64,12 +64,34 @@ __gitdir ()
>  
>  __git_ps1 ()
>  {
> -	local b="$(git symbolic-ref HEAD 2>/dev/null)"
> -	if [ -n "$b" ]; then
> +	local g="$(git rev-parse --git-dir 2>/dev/null)"
> +	if [ -n "$g" ]; then
> +		local r
> +		local b
> +		if [ -d "$g/../.dotest" ]
> +		then
> +			local b="$(git symbolic-ref HEAD 2>/dev/null)"
> +			r="|REBASEING"

I might be in the middle of resolving a conflicted "git am".

But I love the idea.  We need to think about cleaning up our
"state machine" mechanism to make this kind of thing easier to
do.  We've had a few suggestions on the list in the past but
they never passed the suggestion/speculation stage.