[PATCH RFC v2 11/25] ref-filter: rename field in ref_array_item stuct

[Olga Telezhnaya]

Rename objectname field to oid in struct ref_array_item.
Next commit will add objectname field that will contain
string representation of object id.

Signed-off-by: Olga Telezhnaia <olyatelezhn...@gmail.com>
Mentored-by: Christian Couder <christian.cou...@gmail.com>
Mentored by: Jeff King <p...@peff.net>
---
 builtin/cat-file.c |  4 ++--
 ref-filter.c       | 10 +++++-----
 ref-filter.h       |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 61b7acc79155d..367b1bd5802dc 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -186,7 +186,7 @@ static void expand_atom(struct strbuf *sb, const char 
*atom, int len,
                         struct ref_array_item *item)
 {
        if (is_atom("objectname", atom, len))
-               strbuf_addstr(sb, oid_to_hex(&item->objectname));
+               strbuf_addstr(sb, oid_to_hex(&item->oid));
        else if (is_atom("objecttype", atom, len))
                strbuf_addstr(sb, typename(item->type));
        else if (is_atom("objectsize", atom, len))
@@ -294,7 +294,7 @@ static void batch_object_write(const char *obj_name, struct 
batch_options *opt,
                return;
        }
 
-       item.objectname = data->oid;
+       item.oid = data->oid;
        item.type = data->type;
        item.size = data->size;
        item.disk_size = data->disk_size;
diff --git a/ref-filter.c b/ref-filter.c
index 4acd391b5dfac..d09ec1bde6d54 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1489,7 +1489,7 @@ int populate_value(struct ref_array_item *ref)
                                v->s = xstrdup(buf + 1);
                        }
                        continue;
-               } else if (!deref && grab_objectname(name, 
ref->objectname.hash, v, atom)) {
+               } else if (!deref && grab_objectname(name, ref->oid.hash, v, 
atom)) {
                        continue;
                } else if (!strcmp(name, "HEAD")) {
                        if (atom->u.head && !strcmp(ref->refname, atom->u.head))
@@ -1534,13 +1534,13 @@ int populate_value(struct ref_array_item *ref)
        if (used_atom_cnt <= i)
                return 0;
 
-       buf = get_obj(&ref->objectname, &obj, &size, &eaten);
+       buf = get_obj(&ref->oid, &obj, &size, &eaten);
        if (!buf)
                die(_("missing object %s for %s"),
-                   oid_to_hex(&ref->objectname), ref->refname);
+                   oid_to_hex(&ref->oid), ref->refname);
        if (!obj)
                die(_("parse_object_buffer failed on %s for %s"),
-                   oid_to_hex(&ref->objectname), ref->refname);
+                   oid_to_hex(&ref->oid), ref->refname);
 
        grab_values(ref->value, 0, obj, buf, size);
        if (!eaten)
@@ -1890,7 +1890,7 @@ static struct ref_array_item *new_ref_array_item(const 
char *refname,
 {
        struct ref_array_item *ref;
        FLEX_ALLOC_STR(ref, refname, refname);
-       hashcpy(ref->objectname.hash, objectname);
+       hashcpy(ref->oid.hash, objectname);
        ref->flag = flag;
 
        return ref;
diff --git a/ref-filter.h b/ref-filter.h
index e16ea2a990119..87b026b8b76d0 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -34,7 +34,7 @@ struct ref_sorting {
 };
 
 struct ref_array_item {
-       struct object_id objectname;
+       struct object_id oid;
        int flag;
        unsigned int kind;
        const char *symref;

--
https://github.com/git/git/pull/452