add_ref_decoration(): rename s/type/deco_type/

Now that we have two types (a decoration type and an object type) in the
function, let's give them both unique names to avoid accidentally using
one instead of the other.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/log-tree.c b/log-tree.c
index c3c8e7e..4f69ed1 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -135,7 +135,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
 {
        struct object *obj;
        enum object_type objtype;
-       enum decoration_type type = DECORATION_NONE;
+       enum decoration_type deco_type = DECORATION_NONE;
        struct decoration_filter *filter = (struct decoration_filter *)cb_data;
 
        if (filter && !ref_filter_match(refname, filter))
@@ -162,17 +162,17 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid,
        obj = lookup_object_by_type(the_repository, oid, objtype);
 
        if (starts_with(refname, "refs/heads/"))
-               type = DECORATION_REF_LOCAL;
+               deco_type = DECORATION_REF_LOCAL;
        else if (starts_with(refname, "refs/remotes/"))
-               type = DECORATION_REF_REMOTE;
+               deco_type = DECORATION_REF_REMOTE;
        else if (starts_with(refname, "refs/tags/"))
-               type = DECORATION_REF_TAG;
+               deco_type = DECORATION_REF_TAG;
        else if (!strcmp(refname, "refs/stash"))
-               type = DECORATION_REF_STASH;
+               deco_type = DECORATION_REF_STASH;
        else if (!strcmp(refname, "HEAD"))
-               type = DECORATION_REF_HEAD;
+               deco_type = DECORATION_REF_HEAD;
 
-       add_name_decoration(type, refname, obj);
+       add_name_decoration(deco_type, refname, obj);
        while (obj->type == OBJ_TAG) {
                obj = ((struct tag *)obj)->tagged;
                if (!obj)