From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: pclouds@gmail.com, jonathantanmy@google.com, gitster@pobox.com,
jamill@microsoft.com, Stefan Beller <sbeller@google.com>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH v2 02/13] object: add repository argument to create_object
Date: Mon, 7 May 2018 15:59:05 -0700 [thread overview]
Message-ID: <20180507225916.155236-3-sbeller@google.com> (raw)
In-Reply-To: <20180507225916.155236-1-sbeller@google.com>
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>
---
blob.c | 4 +++-
commit.c | 3 ++-
object.c | 5 +++--
object.h | 3 ++-
tag.c | 3 ++-
tree.c | 3 ++-
6 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/blob.c b/blob.c
index fa2ab4f7a74..85c2143f299 100644
--- a/blob.c
+++ b/blob.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "blob.h"
+#include "repository.h"
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)
- 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);
}
diff --git a/commit.c b/commit.c
index ca474a7c112..9106acf0aad 100644
--- 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)
- 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);
}
diff --git a/object.c b/object.c
index f7c624a7ba6..2de029275bc 100644
--- 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;
}
-void *create_object(const unsigned char *sha1, void *o)
+void *create_object_the_repository(const unsigned char *sha1, void *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)
- obj = create_object(sha1, alloc_object_node());
+ obj = create_object(the_repository, sha1,
+ alloc_object_node());
return obj;
}
diff --git a/object.h b/object.h
index cecda7da370..2cb0b241083 100644
--- 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);
-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);
diff --git a/tag.c b/tag.c
index 3d37c1bd251..7150b759d66 100644
--- 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)
- 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);
}
diff --git a/tree.c b/tree.c
index 1c68ea586bd..63730e3fb46 100644
--- 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)
- 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);
}
--
2.17.0.255.g8bfb7c0704
next prev parent reply other threads:[~2018-05-07 22:59 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 21:33 [PATCH 00/13] object store: alloc Stefan Beller
2018-05-01 21:33 ` [PATCH 01/13] repository: introduce object parser field Stefan Beller
2018-05-02 17:17 ` Duy Nguyen
2018-05-02 17:26 ` Stefan Beller
2018-05-02 17:58 ` Duy Nguyen
2018-05-02 20:30 ` Jonathan Tan
2018-05-01 21:33 ` [PATCH 02/13] object: add repository argument to create_object Stefan Beller
2018-05-01 21:43 ` Eric Sunshine
2018-05-01 21:33 ` [PATCH 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-01 21:33 ` [PATCH 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-02 20:34 ` Jonathan Tan
2018-05-01 21:33 ` [PATCH 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-01 21:33 ` [PATCH 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-01 21:33 ` [PATCH 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-01 21:33 ` [PATCH 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-01 21:33 ` [PATCH 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-01 21:34 ` [PATCH 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-01 21:34 ` [PATCH 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-01 21:34 ` [PATCH 12/13] object: allow create_object " Stefan Beller
2018-05-02 20:36 ` Jonathan Tan
2018-05-01 21:34 ` [PATCH 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-02 17:44 ` Duy Nguyen
2018-05-03 17:24 ` Stefan Beller
2018-05-03 17:35 ` Duy Nguyen
2018-05-02 20:50 ` Jonathan Tan
2018-05-03 17:25 ` Stefan Beller
2018-05-03 14:58 ` Duy Nguyen
2018-05-02 17:01 ` [PATCH 00/13] object store: alloc Duy Nguyen
2018-05-02 18:07 ` Jameson Miller
2018-05-02 18:22 ` Duy Nguyen
2018-05-02 18:44 ` Jameson Miller
2018-05-03 22:45 ` Stefan Beller
2018-05-07 14:05 ` Junio C Hamano
2018-05-07 20:53 ` Stefan Beller
2018-05-07 22:59 ` [PATCH v2 " Stefan Beller
2018-05-07 22:59 ` [PATCH v2 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-08 17:23 ` Jonathan Tan
2018-05-07 22:59 ` Stefan Beller [this message]
2018-05-07 22:59 ` [PATCH v2 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-07 22:59 ` [PATCH v2 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-07 22:59 ` [PATCH v2 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-07 22:59 ` [PATCH v2 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-07 22:59 ` [PATCH v2 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-07 22:59 ` [PATCH v2 12/13] object: allow create_object " Stefan Beller
2018-05-07 22:59 ` [PATCH v2 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-08 10:10 ` Jeff King
2018-05-08 15:00 ` Duy Nguyen
2018-05-08 18:38 ` Stefan Beller
2018-05-08 17:45 ` Jonathan Tan
2018-05-08 19:37 ` [PATCH v3 00/13] object store: alloc Stefan Beller
2018-05-08 19:37 ` [PATCH v3 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-08 19:37 ` [PATCH v3 02/13] object: add repository argument to create_object Stefan Beller
2018-05-08 19:37 ` [PATCH v3 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-08 19:37 ` [PATCH v3 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-08 19:37 ` [PATCH v3 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-08 19:37 ` [PATCH v3 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-08 19:37 ` [PATCH v3 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-08 19:37 ` [PATCH v3 12/13] object: allow create_object " Stefan Beller
2018-05-08 19:37 ` [PATCH v3 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-08 20:04 ` Jonathan Tan
2018-05-08 20:37 ` Stefan Beller
2018-05-09 15:54 ` Duy Nguyen
2018-05-09 17:18 ` Duy Nguyen
2018-05-09 19:20 ` Stefan Beller
2018-05-10 15:43 ` Duy Nguyen
2018-05-10 0:40 ` [PATCH v4 00/13] object store: alloc Stefan Beller
2018-05-10 0:40 ` [PATCH v4 01/13] repository: introduce parsed objects field Stefan Beller
2018-05-10 0:40 ` [PATCH v4 02/13] object: add repository argument to create_object Stefan Beller
2018-05-10 0:40 ` [PATCH v4 03/13] object: add repository argument to grow_object_hash Stefan Beller
2018-05-10 0:40 ` [PATCH v4 04/13] alloc: add repository argument to alloc_blob_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 05/13] alloc: add repository argument to alloc_tree_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 06/13] alloc: add repository argument to alloc_commit_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 07/13] alloc: add repository argument to alloc_tag_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 08/13] alloc: add repository argument to alloc_object_node Stefan Beller
2018-05-10 0:40 ` [PATCH v4 09/13] alloc: add repository argument to alloc_report Stefan Beller
2018-05-10 0:40 ` [PATCH v4 10/13] alloc: add repository argument to alloc_commit_index Stefan Beller
2018-05-10 0:40 ` [PATCH v4 11/13] object: allow grow_object_hash to handle arbitrary repositories Stefan Beller
2018-05-10 0:40 ` [PATCH v4 12/13] object: allow create_object " Stefan Beller
2018-05-10 0:40 ` [PATCH v4 13/13] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-10 17:16 ` [PATCH v4 00/13] object store: alloc Jonathan Tan
2018-05-10 17:32 ` Stefan Beller
2018-05-10 20:56 ` Jonathan Tan
2018-05-10 22:36 ` Stefan Beller
2018-05-11 19:17 ` [PATCH] alloc: allow arbitrary repositories for alloc functions Stefan Beller
2018-05-11 19:38 ` Eric Sunshine
2018-05-15 21:48 ` Stefan Beller
2018-05-16 2:27 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180507225916.155236-3-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jamill@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).