Olga Telezhnaya <olyatelezhnaya@xxxxxxxxx> writes:
> Get rid of goto command in ref-filter for better readability.
>
> Signed-off-by: Olga Telezhnaia <olyatelezhnaya@xxxxxxxxx>
> Mentored-by: Christian Couder <christian.couder@xxxxxxxxx>
> Mentored by: Jeff King <peff@xxxxxxxx>
> ---
> 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').
>
> 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
