object: add repository argument to create_object

Add a repository argument to allow the callers of create_object
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.

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 fa2ab4f7a74e501366e1d3ceca9285ae60606165..85c2143f29956a6fbf72bbe24924985ea6c81aa6 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,5 +1,6 @@
 #include "cache.h"
 #include "blob.h"
 #include "cache.h"
 #include "blob.h"

+#include "repository.h"

 
 const char *blob_type = "blob";
 
 
 const char *blob_type = "blob";
 


@@ -7,7 +8,8 @@ struct blob *lookup_blob(const struct object_id *oid)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)

-               return create_object(oid->hash, alloc_blob_node());
+               return create_object(the_repository, oid->hash,
+                                    alloc_blob_node());

        return object_as_type(obj, OBJ_BLOB, 0);
 }
 
        return object_as_type(obj, OBJ_BLOB, 0);
 }
 

diff --git a/commit.c b/commit.c
index ca474a7c112855a49b77cce7cdfb83937fa17fae..9106acf0aadca1047002cfa32d62ececb78f60c3 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -50,7 +50,8 @@ struct commit *lookup_commit(const struct object_id *oid)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)

-               return create_object(oid->hash, alloc_commit_node());
+               return create_object(the_repository, oid->hash,
+                                    alloc_commit_node());

        return object_as_type(obj, OBJ_COMMIT, 0);
 }
 
        return object_as_type(obj, OBJ_COMMIT, 0);
 }
 

diff --git a/object.c b/object.c
index f7c624a7ba66280ac2609b61e06feec49072da03..2de029275bc0b4ee83ec6862bbde9f999a48458c 100644 (file)
--- a/object.c
+++ b/object.c
@@ -138,7 +138,7 @@ static void grow_object_hash(void)
        the_repository->parsed_objects->obj_hash_size = new_hash_size;
 }
 
        the_repository->parsed_objects->obj_hash_size = new_hash_size;
 }
 

-void *create_object(const unsigned char *sha1, void *o)
+void *create_object_the_repository(const unsigned char *sha1, void *o)

 {
        struct object *obj = o;
 
 {
        struct object *obj = o;
 


@@ -178,7 +178,8 @@ struct object *lookup_unknown_object(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj)

-               obj = create_object(sha1, alloc_object_node());
+               obj = create_object(the_repository, sha1,
+                                   alloc_object_node());

        return obj;
 }
 
        return obj;
 }
 

diff --git a/object.h b/object.h
index cecda7da370e28e008b8f4fd02c26b9d63c5e849..2cb0b2410839a27191402a36f560bb24be86190e 100644 (file)
--- a/object.h
+++ b/object.h
@@ -93,7 +93,8 @@ extern struct object *get_indexed_object(unsigned int);
  */
 struct object *lookup_object(const unsigned char *sha1);
 
  */
 struct object *lookup_object(const unsigned char *sha1);
 

-extern void *create_object(const unsigned char *sha1, void *obj);
+#define create_object(r, s, o) create_object_##r(s, o)
+extern void *create_object_the_repository(const unsigned char *sha1, void *obj);

 
 void *object_as_type(struct object *obj, enum object_type type, int quiet);
 
 
 void *object_as_type(struct object *obj, enum object_type type, int quiet);
 

diff --git a/tag.c b/tag.c
index 3d37c1bd251c5f8c5eb06ede72ab57b323888709..7150b759d66ec476e8fa8e403b42b0fba89028c2 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -93,7 +93,8 @@ struct tag *lookup_tag(const struct object_id *oid)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)

-               return create_object(oid->hash, alloc_tag_node());
+               return create_object(the_repository, oid->hash,
+                                    alloc_tag_node());

        return object_as_type(obj, OBJ_TAG, 0);
 }
 
        return object_as_type(obj, OBJ_TAG, 0);
 }
 

diff --git a/tree.c b/tree.c
index 1c68ea586bd30d3e3389efa1c83f25ed607d1d80..63730e3fb46e47872bddce714cba96c0af3a7d9c 100644 (file)
--- a/tree.c
+++ b/tree.c
@@ -196,7 +196,8 @@ struct tree *lookup_tree(const struct object_id *oid)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)
 {
        struct object *obj = lookup_object(oid->hash);
        if (!obj)

-               return create_object(oid->hash, alloc_tree_node());
+               return create_object(the_repository, oid->hash,
+                                    alloc_tree_node());

        return object_as_type(obj, OBJ_TREE, 0);
 }
 
        return object_as_type(obj, OBJ_TREE, 0);
 }