Re: [PATCH 05/15] get_ref_map(): rename local variables
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Oct 23, 2013, 18:45 UTC
- Message-ID
- <xmqqwql3q11q.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1382543448-2586-6-git-send-email-mhagger@alum.mit.edu>
Michael Haggerty <mhagger@alum.mit.edu> writes:
> Rename "refs" -> "refspecs" and "ref_count" -> "refspec_count" to > reduce confusion, because they describe an array of "struct refspec", > as opposed to the "struct ref" objects that are also used in this > function.
Good. In general, we'd prefer to name an array of things that are primarily walked in the index order "thing[]", so that "thing number 3" can be spelled thing[3] (not things[3]) in the code, though.
Show 37 quoted lines
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
> builtin/fetch.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index bd7a101..2248abf 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -165,8 +165,8 @@ static void find_non_local_tags(struct transport *transport,
> struct ref ***tail);
>
> static struct ref *get_ref_map(struct transport *transport,
> - struct refspec *refs, int ref_count, int tags,
> - int *autotags)
> + struct refspec *refspecs, int refspec_count,
> + int tags, int *autotags)
> {
> int i;
> struct ref *rm;
> @@ -175,12 +175,12 @@ static struct ref *get_ref_map(struct transport *transport,
>
> const struct ref *remote_refs = transport_get_remote_refs(transport);
>
> - if (ref_count || tags == TAGS_SET) {
> + if (refspec_count || tags == TAGS_SET) {
> struct ref **old_tail;
>
> - for (i = 0; i < ref_count; i++) {
> - get_fetch_map(remote_refs, &refs[i], &tail, 0);
> - if (refs[i].dst && refs[i].dst[0])
> + for (i = 0; i < refspec_count; i++) {
> + get_fetch_map(remote_refs, &refspecs[i], &tail, 0);
> + if (refspecs[i].dst && refspecs[i].dst[0])
> *autotags = 1;
> }
> /* Merge everything on the command line, but not --tags */