From: SZEDER Gábor <szeder@ira.uka.de>
Date: Thu, 28 May 2009 17:01:47 GMT
Subject: Re: [PATCH] bash: display git prompt in case of merge conflict during rebase
Message-ID: <20090528170147.GN6570@neumann>
In-Reply-To: <1243527441-3394-1-git-send-email-szeder@ira.uka.de>

On Thu, May 28, 2009 at 06:17:21PM +0200, SZEDER Gábor wrote:
> Since e5dd864a (completion: Better __git_ps1 support when not in
> working directory, 2009-02-11) the git prompt becomes empty, if we hit
> a merge conflict during a rebase.
> 
> e5dd864a added an if statement at the end of __git_ps1 to only display
> anything in the prompt, if the branch name is not empty.  This caused
> the empty prompt in the "merge conflict during rebase" case, because
> in this case we display neither the branch name nor the abbreviated
> SHA1, the ongoing rebase is identified.
       ^- although...