From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 02 Sep 2007 00:35:00 GMT
Subject: Re: [PATCH] Improve bash prompt to detect merge / rebase in progress
Message-ID: <Pine.LNX.4.64.0709020133540.28586@racer.site>
In-Reply-To: <20070901222036.GH18160@spearce.org>

Hi,

On Sat, 1 Sep 2007, Shawn O. Pearce wrote:

> Junio C Hamano <gitster@pobox.com> wrote:
> > Robin Rosenberg <robin.rosenberg@dewire.com> writes:
> > >
> > > +	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".
> 
> And there's no way to tell the difference either.

AFAICT git-am creates an "info" file in .dotest/.

And interactive rebase is detectable by the "interactive" file in 
.git/.dotest-merge/.

Ciao,
Dscho