From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 06 Aug 2009 15:50:15 GMT
Subject: Re: [PATCH 3/5] wt-status.c: rework the way changes to the index and work tree are summarized
Message-ID: <7vhbwlndqg.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20090806144638.GA1970@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Wed, Aug 05, 2009 at 02:15:44AM -0700, Junio C Hamano wrote:
>
>> diff --git a/wt-status.c b/wt-status.c
>> index 47735d8..1614352 100644
>> --- a/wt-status.c
>> +++ b/wt-status.c
>> @@ -20,6 +20,7 @@ static char wt_status_colors[][COLOR_MAXLEN] = {
>>  	GIT_COLOR_RED,    /* WT_STATUS_CHANGED */
>>  	GIT_COLOR_RED,    /* WT_STATUS_UNTRACKED */
>>  	GIT_COLOR_RED,    /* WT_STATUS_NOBRANCH */
>> +	GIT_COLOR_YELLOW, /* WT_STATUS_UNMERGED */
>>  };
>
> Does this belong in 3/5? It looks like the WT_STATUS_UNMERGED symbol is
> not used at all until 4/5, which seems like the more logical place
> (since it deals explicitly with unmerged entries). Also, why does it
> start yellow here and then turn to red in the next patch?
>
> And related:
>
>> diff --git a/wt-status.h b/wt-status.h
>> index 78add09..f80142f 100644
>> --- a/wt-status.h
>> +++ b/wt-status.h
>> [...]
>>  	WT_STATUS_NOBRANCH,
>> +	WT_STATUS_UNMERGED,

Thanks.  For the same reason, stagemask and unmerged_mask() helper
function should move from 3/5 to 4/5.