Re: [PATCH 2/2] ref-filter: get rid of goto

From: Оля Тележная <olyatelezhnaya@gmail.com>
Date: Feb 22, 2018, 05:35 UTC
Message-ID: <CAL21Bm=FptUV3xRnYf-iiht8HQF+-uF=cOZyybh7VNCmP=Nxbg@mail.gmail.com>
In-Reply-To: <xmqqpo4yz1cw.fsf@gitster-ct.c.googlers.com>

2018-02-21 20:41 GMT+03:00 Junio C Hamano <gitster@pobox.com>:

Show 19 quoted lines

> Olga Telezhnaya <olyatelezhnaya@gmail.com> writes:
>
>> Get rid of goto command in ref-filter for better readability.
>>
>> Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
>> Mentored-by: Christian Couder <christian.couder@gmail.com>
>> Mentored by: Jeff King <peff@peff.net>
>> ---
>>  ref-filter.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> It looks like this is the same change as the bottom-most change on
> your "cat-file --batch" series (and is obviously correct).
>
> I am puzzled by your intention---are you re-organizing and rebooting
> the series?  Either 'Yes' or 'No' is an acceptable answer, and so is
> anything else.  I just want to know what you want to happen to the
> merge conflicts if I queued this while still keeping your "cat-file
> --batch" thing I have on 'pu').

Thanks for the question, I needed to mention that. We (with Peff) decided that it's better and easier to remake whole previous patch. Before that, I want to make some refactorings in ref-filter so after that migrating should go much easier. I want to do that by small separate patches, so this is first in the series. I hope it would be both easier to review for you and easier to fix for me. So, if everything is fine, you could merge it to master. I will rewrite most parts of previous patch anyway.

Thanks!

Show 24 quoted lines

>
>>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index 83ffd84affe52..28df6e21fb996 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1494,11 +1494,11 @@ static void populate_value(struct ref_array_item *ref)
>>       for (i = 0; i < used_atom_cnt; i++) {
>>               struct atom_value *v = &ref->value[i];
>>               if (v->s == NULL)
>> -                     goto need_obj;
>> +                     break;
>>       }
>> -     return;
>> +     if (used_atom_cnt <= i)
>> +             return;
>>
>> - need_obj:
>>       get_object(ref, &ref->objectname, 0, &obj);
>>
>>       /*
>>
>> --
>> https://github.com/git/git/pull/460