On Fri, May 06, 2011 at 01:39:25AM +0200, Pierre Habouzit wrote: > On Thu, May 05, 2011 at 04:37:00PM -0700, Junio C Hamano wrote: > > Pierre Habouzit <madcoder@xxxxxxxxxx> 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. s/rebase/bisect/ sorry it's late. Anyways it prints nothing if the repository "looks normal" -- ÂOÂ Pierre Habouzit ÂÂO madcoder@xxxxxxxxxx OOO http://www.madism.org -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html