blob: add repository argument to lookup_blob

Add a repository argument to allow the callers of lookup_blob
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.

As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/blob.c b/blob.c
index dada295698cebb6053737d9df0af7f2e95ff087c..17b9314f0a0c81abc2643ae5478ebc83be057bc7 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -5,7 +5,7 @@
 
 const char *blob_type = "blob";
 
 
 const char *blob_type = "blob";
 

-struct blob *lookup_blob(const struct object_id *oid)
+struct blob *lookup_blob_the_repository(const struct object_id *oid)

 {
        struct object *obj = lookup_object(the_repository, oid->hash);
        if (!obj)
 {
        struct object *obj = lookup_object(the_repository, oid->hash);
        if (!obj)

diff --git a/blob.h b/blob.h
index 446061683101d5578f8de2b8aa43e4b6c51d1d66..08bc34487a07a956a45987310023b7f095a5a3e3 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -9,7 +9,8 @@ struct blob {
        struct object object;
 };
 
        struct object object;
 };
 

-struct blob *lookup_blob(const struct object_id *oid);
+#define lookup_blob(r, o) lookup_blob_##r(o)
+struct blob *lookup_blob_the_repository(const struct object_id *oid);

 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
 
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
 

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 03a2e4b79e6a4937d2679a9fe79c5a307605783e..7d6b1d8aea23d2f229953fc4ae23cc10f428711d 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -236,7 +236,7 @@ static void export_blob(const struct object_id *oid)
 
        if (anonymize) {
                buf = anonymize_blob(&size);
 
        if (anonymize) {
                buf = anonymize_blob(&size);

-               object = (struct object *)lookup_blob(oid);
+               object = (struct object *)lookup_blob(the_repository, oid);

                eaten = 0;
        } else {
                buf = read_object_file(oid, &type, &size);
                eaten = 0;
        } else {
                buf = read_object_file(oid, &type, &size);

diff --git a/builtin/fsck.c b/builtin/fsck.c
index a906fe4a82b13427d51cbc564cef0242033be5db..263191942d4c6f785961fd0ed36cbac9b5748206 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -810,7 +810,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        mode = active_cache[i]->ce_mode;
                        if (S_ISGITLINK(mode))
                                continue;
                        mode = active_cache[i]->ce_mode;
                        if (S_ISGITLINK(mode))
                                continue;

-                       blob = lookup_blob(&active_cache[i]->oid);
+                       blob = lookup_blob(the_repository,
+                                          &active_cache[i]->oid);

                        if (!blob)
                                continue;
                        obj = &blob->object;
                        if (!blob)
                                continue;
                        obj = &blob->object;

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 9c08cf3ceadaff8b56aecf2421d06c060fcf835a..de311febe3034cb17cb26a57757c144842af8d9f 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -832,7 +832,7 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
        if (strict || do_fsck_object) {
                read_lock();
                if (type == OBJ_BLOB) {
        if (strict || do_fsck_object) {
                read_lock();
                if (type == OBJ_BLOB) {

-                       struct blob *blob = lookup_blob(oid);
+                       struct blob *blob = lookup_blob(the_repository, oid);

                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else
                        if (blob)
                                blob->object.flags |= FLAG_CHECKED;
                        else

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 8a8d579752050487269bcc63aac4713c0b8ebc1e..f8023bae1e2eceaa8ea086f5d990d8bc4c0e6121 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -2,6 +2,7 @@
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "object-store.h"
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "object-store.h"

+#include "repository.h"

 #include "blob.h"
 #include "exec-cmd.h"
 #include "merge-blobs.h"
 #include "blob.h"
 #include "exec-cmd.h"
 #include "merge-blobs.h"


@@ -170,7 +171,7 @@ static struct merge_list *create_entry(unsigned stage, unsigned mode, const stru
        res->stage = stage;
        res->path = path;
        res->mode = mode;
        res->stage = stage;
        res->path = path;
        res->mode = mode;

-       res->blob = lookup_blob(oid);
+       res->blob = lookup_blob(the_repository, oid);

        return res;
 }
 
        return res;
 }
 

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 75d1d5ea0b8417b5842257b08d320868c6880764..716408e3a9db7499e338905b68444c7dc0a3149f 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -254,7 +254,7 @@ static void write_object(unsigned nr, enum object_type type,
                added_object(nr, type, buf, size);
                free(buf);
 
                added_object(nr, type, buf, size);
                free(buf);
 

-               blob = lookup_blob(&obj_list[nr].oid);
+               blob = lookup_blob(the_repository, &obj_list[nr].oid);

                if (blob)
                        blob->object.flags |= FLAG_WRITTEN;
                else
                if (blob)
                        blob->object.flags |= FLAG_WRITTEN;
                else

diff --git a/fsck.c b/fsck.c
index bb3d622fb934aaa367be71fcc20e23d7c1100f98..ea00f7228df5694817b321d3f0ea654dadf6405b 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -414,7 +414,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
                        result = options->walk(obj, OBJ_TREE, data, options);
                }
                else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
                        result = options->walk(obj, OBJ_TREE, data, options);
                }
                else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {

-                       obj = (struct object *)lookup_blob(entry.oid);
+                       obj = (struct object *)lookup_blob(the_repository, entry.oid);

                        if (name && obj)
                                put_object_name(options, obj, "%s%s", name,
                                        entry.path);
                        if (name && obj)
                                put_object_name(options, obj, "%s%s", name,
                                        entry.path);


@@ -1070,7 +1070,7 @@ int fsck_finish(struct fsck_options *options)
                if (oidset_contains(&gitmodules_done, oid))
                        continue;
 
                if (oidset_contains(&gitmodules_done, oid))
                        continue;
 

-               blob = lookup_blob(oid);
+               blob = lookup_blob(the_repository, oid);

                if (!blob) {
                        struct object *obj = lookup_unknown_object(oid->hash);
                        ret |= report(options, obj,
                if (!blob) {
                        struct object *obj = lookup_unknown_object(oid->hash);
                        ret |= report(options, obj,

diff --git a/http-push.c b/http-push.c
index d2245cc73802fec76ed8613adf84c3995e70b716..191b51cb59193d55742ffd9b959a609360124f55 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1314,7 +1314,8 @@ static struct object_list **process_tree(struct tree *tree,
                        p = process_tree(lookup_tree(entry.oid), p);
                        break;
                case OBJ_BLOB:
                        p = process_tree(lookup_tree(entry.oid), p);
                        break;
                case OBJ_BLOB:

-                       p = process_blob(lookup_blob(entry.oid), p);
+                       p = process_blob(lookup_blob(the_repository, entry.oid),
+                                        p);

                        break;
                default:
                        /* Subproject commit - not in this repository */
                        break;
                default:
                        /* Subproject commit - not in this repository */

diff --git a/list-objects.c b/list-objects.c
index 3e5e1992eb0cd1c535ed42e9729941403ca89054..04c45f66e8830e9c965621b4fd4a879326bcfe5b 100644 (file)
--- a/list-objects.c
+++ b/list-objects.c
@@ -167,7 +167,7 @@ static void process_tree(struct rev_info *revs,
                                        cb_data);
                else
                        process_blob(revs,
                                        cb_data);
                else
                        process_blob(revs,

-                                    lookup_blob(entry.oid),
+                                    lookup_blob(the_repository, entry.oid),

                                     show, base, entry.path,
                                     cb_data, filter_fn, filter_data);
        }
                                     show, base, entry.path,
                                     cb_data, filter_fn, filter_data);
        }

diff --git a/object.c b/object.c
index 404919043d478ead8e6a1c894c4474fe068150b9..fde816ad952289fc9c336a37984d6a95aa4e3e90 100644 (file)
--- a/object.c
+++ b/object.c
@@ -193,7 +193,7 @@ struct object *parse_object_buffer_the_repository(const struct object_id *oid, e
 
        obj = NULL;
        if (type == OBJ_BLOB) {
 
        obj = NULL;
        if (type == OBJ_BLOB) {

-               struct blob *blob = lookup_blob(oid);
+               struct blob *blob = lookup_blob(the_repository, oid);

                if (blob) {
                        if (parse_blob_buffer(blob, buffer, size))
                                return NULL;
                if (blob) {
                        if (parse_blob_buffer(blob, buffer, size))
                                return NULL;


@@ -266,7 +266,7 @@ struct object *parse_object_the_repository(const struct object_id *oid)
                        error("sha1 mismatch %s", oid_to_hex(oid));
                        return NULL;
                }
                        error("sha1 mismatch %s", oid_to_hex(oid));
                        return NULL;
                }

-               parse_blob_buffer(lookup_blob(oid), NULL, 0);
+               parse_blob_buffer(lookup_blob(the_repository, oid), NULL, 0);

                return lookup_object(the_repository, oid->hash);
        }
 
                return lookup_object(the_repository, oid->hash);
        }
 

diff --git a/reachable.c b/reachable.c
index 2ee55695595937aeac54280daf2da9815b5988ec..cc25f012e5df10fd04f2e4739a10297bc546a9d3 100644 (file)
--- a/reachable.c
+++ b/reachable.c
@@ -91,7 +91,7 @@ static void add_recent_object(const struct object_id *oid,
                obj = (struct object *)lookup_tree(oid);
                break;
        case OBJ_BLOB:
                obj = (struct object *)lookup_tree(oid);
                break;
        case OBJ_BLOB:

-               obj = (struct object *)lookup_blob(oid);
+               obj = (struct object *)lookup_blob(the_repository, oid);

                break;
        default:
                die("unknown object type for %s: %s",
                break;
        default:
                die("unknown object type for %s: %s",

diff --git a/revision.c b/revision.c
index 8a2b2850cad2c081136e022f9f52ce5df67777af..e3824127567ba483ebb5f16d6b87d91260d1597b 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -66,7 +66,7 @@ static void mark_tree_contents_uninteresting(struct tree *tree)
                        mark_tree_uninteresting(lookup_tree(entry.oid));
                        break;
                case OBJ_BLOB:
                        mark_tree_uninteresting(lookup_tree(entry.oid));
                        break;
                case OBJ_BLOB:

-                       mark_blob_uninteresting(lookup_blob(entry.oid));
+                       mark_blob_uninteresting(lookup_blob(the_repository, entry.oid));

                        break;
                default:
                        /* Subproject commit - not in this repository */
                        break;
                default:
                        /* Subproject commit - not in this repository */


@@ -1348,7 +1348,7 @@ static void do_add_index_objects_to_pending(struct rev_info *revs,
                if (S_ISGITLINK(ce->ce_mode))
                        continue;
 
                if (S_ISGITLINK(ce->ce_mode))
                        continue;
 

-               blob = lookup_blob(&ce->oid);
+               blob = lookup_blob(the_repository, &ce->oid);

                if (!blob)
                        die("unable to add index blob to traversal");
                add_pending_object_with_path(revs, &blob->object, "",
                if (!blob)
                        die("unable to add index blob to traversal");
                add_pending_object_with_path(revs, &blob->object, "",

diff --git a/tag.c b/tag.c
index a14a4f230374193255611960b2a00936caa4eab0..a31ae75e9608e1fa8f434715cfc015cad0438ea6 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -154,7 +154,7 @@ int parse_tag_buffer(struct tag *item, const void *data, unsigned long size)
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {
        bufptr = nl + 1;
 
        if (!strcmp(type, blob_type)) {

-               item->tagged = (struct object *)lookup_blob(&oid);
+               item->tagged = (struct object *)lookup_blob(the_repository, &oid);

        } else if (!strcmp(type, tree_type)) {
                item->tagged = (struct object *)lookup_tree(&oid);
        } else if (!strcmp(type, commit_type)) {
        } else if (!strcmp(type, tree_type)) {
                item->tagged = (struct object *)lookup_tree(&oid);
        } else if (!strcmp(type, commit_type)) {

diff --git a/walker.c b/walker.c
index 63002b18875d2c1d3c18e33c29d0ff6df5ded55a..5b56c72a73841763b94f7be59aaf094916e51bc8 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -54,7 +54,8 @@ static int process_tree(struct walker *walker, struct tree *tree)
                                obj = &tree->object;
                }
                else {
                                obj = &tree->object;
                }
                else {

-                       struct blob *blob = lookup_blob(entry.oid);
+                       struct blob *blob = lookup_blob(the_repository,
+                                                       entry.oid);

                        if (blob)
                                obj = &blob->object;
                }
                        if (blob)
                                obj = &blob->object;
                }