get_ref_map(): rename local variables
authorMichael Haggerty <mhagger@alum.mit.edu>
Wed, 23 Oct 2013 15:50:38 +0000 (17:50 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2013 20:28:44 +0000 (13:28 -0700)
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.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fetch.c
index bd7a10164f4fed8aeb6e8148e2ae8c0a793e7ee0..2248abfd33c54535dbdca632b9d5816c2a205296 100644 (file)
@@ -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 */