Re: [RFC/PATCH 1/3] revision.c: tighten up TREESAME handling of merges

[David Aguilar <davvid@gmail.com>]

On Sat, Apr 27, 2013 at 3:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Kevin Bracey <kevin@bracey.fi> writes:
>> diff --git a/revision.c b/revision.c
>> index a67b615..176eb7b 100644
>> --- a/revision.c
>> +++ b/revision.c
>> @@ -1971,6 +2066,70 @@ static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs,
>>       return st;
>>  }
>>
>> +static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
>> +{
>> +     struct commit_list *h = reduce_heads(commit->parents);
>> +     int i = 0, marked = 0;
>> +     struct commit_list *po, *pn;
>> +
>> +     /* Want these for sanity only */
>> +     int orig_cnt = commit_list_count(commit->parents);
>> +     int cnt = commit_list_count(h);
>> +
>> +     /* Not ready to remove items yet, just mark them for now, based
>
> (same style on "/*")
>
>> +      * on the output of reduce_heads(). reduce_heads outputs the reduced
>> +      * set in its original order, so this isn't too hard.
>> +      */
>> +     po = commit->parents;
>> +     pn = h;
>> +     while (po) {
>> +             if (pn && po->item == pn->item) {
>> +                     pn=pn->next;
>
> (style) SPs before and after '='.
>
>> +                     i++;
>> +             }
>> +             else {

(style) cuddle this } else { block.
--
David