builtin/reflog: convert tree_is_complete to take struct object_id

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

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 4831116ea3058ba8a631f7822691dede386234a5..7866a034123258611977055a8d39cf5066c32712 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -55,14 +55,14 @@ struct collect_reflog_cb {
 #define STUDYING       (1u<<11)
 #define REACHABLE      (1u<<12)
 
 #define STUDYING       (1u<<11)
 #define REACHABLE      (1u<<12)
 

-static int tree_is_complete(const unsigned char *sha1)
+static int tree_is_complete(const struct object_id *oid)

 {
        struct tree_desc desc;
        struct name_entry entry;
        int complete;
        struct tree *tree;
 
 {
        struct tree_desc desc;
        struct name_entry entry;
        int complete;
        struct tree *tree;
 

-       tree = lookup_tree(sha1);
+       tree = lookup_tree(oid->hash);

        if (!tree)
                return 0;
        if (tree->object.flags & SEEN)
        if (!tree)
                return 0;
        if (tree->object.flags & SEEN)


@@ -73,7 +73,7 @@ static int tree_is_complete(const unsigned char *sha1)
        if (!tree->buffer) {
                enum object_type type;
                unsigned long size;
        if (!tree->buffer) {
                enum object_type type;
                unsigned long size;

-               void *data = read_sha1_file(sha1, &type, &size);
+               void *data = read_sha1_file(oid->hash, &type, &size);

                if (!data) {
                        tree->object.flags |= INCOMPLETE;
                        return 0;
                if (!data) {
                        tree->object.flags |= INCOMPLETE;
                        return 0;


@@ -85,7 +85,7 @@ static int tree_is_complete(const unsigned char *sha1)
        complete = 1;
        while (tree_entry(&desc, &entry)) {
                if (!has_sha1_file(entry.oid->hash) ||
        complete = 1;
        while (tree_entry(&desc, &entry)) {
                if (!has_sha1_file(entry.oid->hash) ||

-                   (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid->hash))) {
+                   (S_ISDIR(entry.mode) && !tree_is_complete(entry.oid))) {

                        tree->object.flags |= INCOMPLETE;
                        complete = 0;
                }
                        tree->object.flags |= INCOMPLETE;
                        complete = 0;
                }


@@ -152,7 +152,7 @@ static int commit_is_complete(struct commit *commit)
                for (i = 0; i < found.nr; i++) {
                        struct commit *c =
                                (struct commit *)found.objects[i].item;
                for (i = 0; i < found.nr; i++) {
                        struct commit *c =
                                (struct commit *)found.objects[i].item;

-                       if (!tree_is_complete(c->tree->object.oid.hash)) {
+                       if (!tree_is_complete(&c->tree->object.oid)) {

                                is_incomplete = 1;
                                c->object.flags |= INCOMPLETE;
                        }
                                is_incomplete = 1;
                                c->object.flags |= INCOMPLETE;
                        }