Re: [PATCH 1/1] status: display "doing what" information in git status

[Pierre Habouzit <madcoder@debian.org>]

On Thu, May 05, 2011 at 04:37:00PM -0700, Junio C Hamano wrote:
> Pierre Habouzit <madcoder@debian.org> writes:
> 
> > @@ -732,6 +805,7 @@ void wt_status_print(struct wt_status *s)
> >  		status_printf_ln(s, color(WT_STATUS_HEADER, s), "");
> >  	}
> >  
> > +	wt_status_print_doingwhat(s);
> >  	wt_status_print_updated(s);
> >  	wt_status_print_unmerged(s);
> >  	wt_status_print_changed(s);
> 
> I am very surprised that a new call to this function is added here.
> 
> 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.

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org