Convert struct ref_array_item to struct object_id

Convert struct ref_array_item to use struct object_id by changing the
definition and applying the following semantic patch, plus the standard
object_id transforms:

@@
struct ref_array_item E1;
@@
- E1.objectname
+ E1.objectname.hash

@@
struct ref_array_item *E1;
@@
- E1->objectname
+ E1->objectname.hash

This transformation allows us to convert get_obj, which is needed to
convert parse_object_buffer.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index e1d18ac0d144806c1ea703e173ee2021b50cc4b0..77aee273f8091de33032f76b59cb2b351db58573 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1366,7 +1366,7 @@ static void populate_value(struct ref_array_item *ref)
                                v->s = xstrdup(buf + 1);
                        }
                        continue;
                                v->s = xstrdup(buf + 1);
                        }
                        continue;

-               } else if (!deref && grab_objectname(name, ref->objectname, v, atom)) {
+               } else if (!deref && grab_objectname(name, ref->objectname.hash, v, atom)) {

                        continue;
                } else if (!strcmp(name, "HEAD")) {
                        const char *head;
                        continue;
                } else if (!strcmp(name, "HEAD")) {
                        const char *head;


@@ -1415,13 +1415,13 @@ static void populate_value(struct ref_array_item *ref)
        return;
 
  need_obj:
        return;
 
  need_obj:

-       buf = get_obj(ref->objectname, &obj, &size, &eaten);
+       buf = get_obj(ref->objectname.hash, &obj, &size, &eaten);

        if (!buf)
                die(_("missing object %s for %s"),
        if (!buf)
                die(_("missing object %s for %s"),

-                   sha1_to_hex(ref->objectname), ref->refname);
+                   oid_to_hex(&ref->objectname), ref->refname);

        if (!obj)
                die(_("parse_object_buffer failed on %s for %s"),
        if (!obj)
                die(_("parse_object_buffer failed on %s for %s"),

-                   sha1_to_hex(ref->objectname), ref->refname);
+                   oid_to_hex(&ref->objectname), ref->refname);

 
        grab_values(ref->value, 0, obj, buf, size);
        if (!eaten)
 
        grab_values(ref->value, 0, obj, buf, size);
        if (!eaten)


@@ -1704,7 +1704,7 @@ static struct ref_array_item *new_ref_array_item(const char *refname,
 {
        struct ref_array_item *ref;
        FLEX_ALLOC_STR(ref, refname, refname);
 {
        struct ref_array_item *ref;
        FLEX_ALLOC_STR(ref, refname, refname);

-       hashcpy(ref->objectname, objectname);
+       hashcpy(ref->objectname.hash, objectname);

        ref->flag = flag;
 
        return ref;
        ref->flag = flag;
 
        return ref;

diff --git a/ref-filter.h b/ref-filter.h
index c20167aa3c785f0060147204d963537f58617570..6552024f09e4d4d587eaf49377e7504a79818c1d 100644 (file)
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -34,7 +34,7 @@ struct ref_sorting {
 };
 
 struct ref_array_item {
 };
 
 struct ref_array_item {

-       unsigned char objectname[20];
+       struct object_id objectname;

        int flag;
        unsigned int kind;
        const char *symref;
        int flag;
        unsigned int kind;
        const char *symref;