object: convert lookup_unknown_object() to use object_id

There are no callers left of lookup_unknown_object() that aren't just
passing us the "hash" member of a "struct object_id". Let's take the
whole struct, which gets us closer to removing all raw sha1 variables.
It also matches the existing conversions of lookup_blob(), etc.

The conversions of callers were done by hand, but they're all mechanical
one-liners.

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

diff --git a/builtin/fsck.c b/builtin/fsck.c
index d26fb0a04472b18a856658cf2800dd9655a6bf24..e422c82465a5c6dcdd842063f008382093773e38 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -756,7 +756,7 @@ static int fsck_cache_tree(struct cache_tree *it)
 
 static void mark_object_for_connectivity(const struct object_id *oid)
 {
 
 static void mark_object_for_connectivity(const struct object_id *oid)
 {

-       struct object *obj = lookup_unknown_object(oid->hash);
+       struct object *obj = lookup_unknown_object(oid);

        obj->flags |= HAS_OBJ;
 }
 
        obj->flags |= HAS_OBJ;
 }
 

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index c95693fd4b7ade9de60b7a73c25cf088df1692d2..3e8467aa236b2922820c9fa127dc9ef15794d6db 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2923,7 +2923,7 @@ static void add_objects_in_unpacked_packs(void)
 
                for (i = 0; i < p->num_objects; i++) {
                        nth_packed_object_oid(&oid, p, i);
 
                for (i = 0; i < p->num_objects; i++) {
                        nth_packed_object_oid(&oid, p, i);

-                       o = lookup_unknown_object(oid.hash);
+                       o = lookup_unknown_object(&oid);

                        if (!(o->flags & OBJECT_ADDED))
                                mark_in_pack_object(o, p, &in_pack);
                        o->flags |= OBJECT_ADDED;
                        if (!(o->flags & OBJECT_ADDED))
                                mark_in_pack_object(o, p, &in_pack);
                        o->flags |= OBJECT_ADDED;

diff --git a/fsck.c b/fsck.c
index 4703f55561452c3fca5401aba3fcec7b170f1c6a..117c4a978f410047b6ca4b939ca6c294d6163dfc 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -1092,7 +1092,7 @@ int fsck_finish(struct fsck_options *options)
 
                blob = lookup_blob(the_repository, oid);
                if (!blob) {
 
                blob = lookup_blob(the_repository, oid);
                if (!blob) {

-                       struct object *obj = lookup_unknown_object(oid->hash);
+                       struct object *obj = lookup_unknown_object(oid);

                        ret |= report(options, obj,
                                      FSCK_MSG_GITMODULES_BLOB,
                                      "non-blob found at .gitmodules");
                        ret |= report(options, obj,
                                      FSCK_MSG_GITMODULES_BLOB,
                                      "non-blob found at .gitmodules");

diff --git a/http-push.c b/http-push.c
index e36561a6db0752f12fe22883f81489d62d81a4ca..96a98e1e615968b20d84aac0ecf6098934e83851 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1432,7 +1432,7 @@ static void one_remote_ref(const char *refname)
         * may be required for updating server info later.
         */
        if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) {
         * may be required for updating server info later.
         */
        if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) {

-               obj = lookup_unknown_object(ref->old_oid.hash);
+               obj = lookup_unknown_object(&ref->old_oid);

                fprintf(stderr, "  fetch %s for %s\n",
                        oid_to_hex(&ref->old_oid), refname);
                add_fetch_request(obj);
                fprintf(stderr, "  fetch %s for %s\n",
                        oid_to_hex(&ref->old_oid), refname);
                add_fetch_request(obj);

diff --git a/object.c b/object.c
index e81d47a79cd6eb42fae7c104be0e9ac1e5173e79..d5b1d8daaf7bf761cb145289d9c3999829d96fdd 100644 (file)
--- a/object.c
+++ b/object.c
@@ -178,11 +178,11 @@ void *object_as_type(struct repository *r, struct object *obj, enum object_type
        }
 }
 
        }
 }
 

-struct object *lookup_unknown_object(const unsigned char *sha1)
+struct object *lookup_unknown_object(const struct object_id *oid)

 {
 {

-       struct object *obj = lookup_object(the_repository, sha1);
+       struct object *obj = lookup_object(the_repository, oid->hash);

        if (!obj)
        if (!obj)

-               obj = create_object(the_repository, sha1,
+               obj = create_object(the_repository, oid->hash,

                                    alloc_object_node(the_repository));
        return obj;
 }
                                    alloc_object_node(the_repository));
        return obj;
 }

diff --git a/object.h b/object.h
index 4526979ccf264d10a0fddafcb49697b45fadf71c..5e0ccfe0e40415d2e50f6ebed7b27f20bde885f5 100644 (file)
--- a/object.h
+++ b/object.h
@@ -143,7 +143,7 @@ struct object *parse_object_or_die(const struct object_id *oid, const char *name
 struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
 
 /** Returns the object, with potentially excess memory allocated. **/
 struct object *parse_object_buffer(struct repository *r, const struct object_id *oid, enum object_type type, unsigned long size, void *buffer, int *eaten_p);
 
 /** Returns the object, with potentially excess memory allocated. **/

-struct object *lookup_unknown_object(const unsigned  char *sha1);
+struct object *lookup_unknown_object(const struct object_id *oid);

 
 struct object_list *object_list_insert(struct object *item,
                                       struct object_list **list_p);
 
 struct object_list *object_list_insert(struct object *item,
                                       struct object_list **list_p);

diff --git a/refs.c b/refs.c
index b8a8430c963831d9f761fbd8dad099370286987f..cd297ee4bdbe48b04696ddf923273a857ce59884 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -379,7 +379,7 @@ static int filter_refs(const char *refname, const struct object_id *oid,
 
 enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
 {
 
 enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
 {

-       struct object *o = lookup_unknown_object(name->hash);
+       struct object *o = lookup_unknown_object(name);

 
        if (o->type == OBJ_NONE) {
                int type = oid_object_info(the_repository, name, NULL);
 
        if (o->type == OBJ_NONE) {
                int type = oid_object_info(the_repository, name, NULL);

diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c
index a20a6161e4fce156cc2e987f61f4253b1f00b397..c8a1cde7d2de96461f74aabad6a5d664eeb8eefa 100644 (file)
--- a/t/helper/test-example-decorate.c
+++ b/t/helper/test-example-decorate.c
@@ -26,8 +26,8 @@ int cmd__example_decorate(int argc, const char **argv)
         * Add 2 objects, one with a non-NULL decoration and one with a NULL
         * decoration.
         */
         * Add 2 objects, one with a non-NULL decoration and one with a NULL
         * decoration.
         */

-       one = lookup_unknown_object(one_oid.hash);
-       two = lookup_unknown_object(two_oid.hash);
+       one = lookup_unknown_object(&one_oid);
+       two = lookup_unknown_object(&two_oid);

        ret = add_decoration(&n, one, &decoration_a);
        if (ret)
                BUG("when adding a brand-new object, NULL should be returned");
        ret = add_decoration(&n, one, &decoration_a);
        if (ret)
                BUG("when adding a brand-new object, NULL should be returned");


@@ -56,7 +56,7 @@ int cmd__example_decorate(int argc, const char **argv)
        ret = lookup_decoration(&n, two);
        if (ret != &decoration_b)
                BUG("lookup should return added declaration");
        ret = lookup_decoration(&n, two);
        if (ret != &decoration_b)
                BUG("lookup should return added declaration");

-       three = lookup_unknown_object(three_oid.hash);
+       three = lookup_unknown_object(&three_oid);

        ret = lookup_decoration(&n, three);
        if (ret)
                BUG("lookup for unknown object should return NULL");
        ret = lookup_decoration(&n, three);
        if (ret)
                BUG("lookup for unknown object should return NULL");

diff --git a/upload-pack.c b/upload-pack.c
index d9a62adef02cf81c4cb2536d93b63575c9f8ba4e..ecc19641fe6790a221238edbe7c9b6c45e53ebe7 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -960,7 +960,7 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
 static int mark_our_ref(const char *refname, const char *refname_full,
                        const struct object_id *oid)
 {
 static int mark_our_ref(const char *refname, const char *refname_full,
                        const struct object_id *oid)
 {

-       struct object *o = lookup_unknown_object(oid->hash);
+       struct object *o = lookup_unknown_object(oid);

 
        if (ref_is_hidden(refname, refname_full)) {
                o->flags |= HIDDEN_REF;
 
        if (ref_is_hidden(refname, refname_full)) {
                o->flags |= HIDDEN_REF;

diff --git a/walker.c b/walker.c
index d74ae59c77fb3626be0af291c6ee6fbb9c52dbb1..06cd2bd5691a5df247c9b07ca9a4cc3b58ed3912 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -285,7 +285,7 @@ int walker_fetch(struct walker *walker, int targets, char **target,
                        error("Could not interpret response from server '%s' as something to pull", target[i]);
                        goto done;
                }
                        error("Could not interpret response from server '%s' as something to pull", target[i]);
                        goto done;
                }

-               if (process(walker, lookup_unknown_object(oids[i].hash)))
+               if (process(walker, lookup_unknown_object(&oids[i])))

                        goto done;
        }
 
                        goto done;
        }