From: Pierre Habouzit <madcoder@debian.org>
Date: Thu, 05 May 2011 23:51:29 GMT
Subject: Re: [PATCH 1/1] status: display "doing what" information in git status
Message-ID: <20110505235129.GG636@madism.org>
In-Reply-To: <7vr58c4sip.fsf@alter.siamese.dyndns.org>

On Thu, May 05, 2011 at 04:49:50PM -0700, Junio C Hamano wrote:
> Pierre Habouzit <madcoder@debian.org> writes:
> 
> >> As the "You are in middle of" information is useful mostly when you are on
> >> detached head, I would have expected that the call would be inside the
> >> if/elif chain near the top of wt_status_print() where we say "On branch"
> >> vs "Not currently on...", to replace that information that comes from that
> >> on_what variable.
> >
> > It's also useful when you're in the middle of a rebase or during a merge
> > conflict who aren't on a detached head.
> 
> What I would expect in such a case would be like:
> 
> 	# On branch master (resolving merge with ph/status)
> 
> instead of wasting an extra line like:
> 
> 	# Resolving a merge conflict
>         # On branch master
> 
> That is what I meant "to replace".

okay it's really late, sorry, I read too fast, I'll work on something
like that, doesn't looks too complicated ;)

I'll post an updated patch on tomorrow.
-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org