Web lists-archives.com

[PATCH 178/194] object: allow parse_object to handle arbitrary repositories




Signed-off-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
 object.c | 20 ++++++++++----------
 object.h |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/object.c b/object.c
index 2a05613c64..2fe5fac3ce 100644
--- a/object.c
+++ b/object.c
@@ -244,39 +244,39 @@ struct object *parse_object_or_die(const struct object_id *oid,
 	die(_("unable to parse object: %s"), name ? name : oid_to_hex(oid));
 }
 
-struct object *parse_object_the_repository(const struct object_id *oid)
+struct object *parse_object(struct repository *r, const struct object_id *oid)
 {
 	unsigned long size;
 	enum object_type type;
 	int eaten;
-	const unsigned char *repl = lookup_replace_object(the_repository, oid->hash);
+	const unsigned char *repl = lookup_replace_object(r, oid->hash);
 	void *buffer;
 	struct object *obj;
 
-	obj = lookup_object(the_repository, oid->hash);
+	obj = lookup_object(r, oid->hash);
 	if (obj && obj->parsed)
 		return obj;
 
 	if ((obj && obj->type == OBJ_BLOB) ||
 	    (!obj && has_object_file(oid) &&
-	     sha1_object_info(the_repository, oid->hash, NULL) == OBJ_BLOB)) {
-		if (check_sha1_signature(the_repository, repl, NULL, 0, NULL) < 0) {
+	     sha1_object_info(r, oid->hash, NULL) == OBJ_BLOB)) {
+		if (check_sha1_signature(r, repl, NULL, 0, NULL) < 0) {
 			error("sha1 mismatch %s", oid_to_hex(oid));
 			return NULL;
 		}
-		parse_blob_buffer(lookup_blob(the_repository, oid), NULL, 0);
-		return lookup_object(the_repository, oid->hash);
+		parse_blob_buffer(lookup_blob(r, oid), NULL, 0);
+		return lookup_object(r, oid->hash);
 	}
 
-	buffer = read_sha1_file(the_repository, oid->hash, &type, &size);
+	buffer = read_sha1_file(r, oid->hash, &type, &size);
 	if (buffer) {
-		if (check_sha1_signature(the_repository, repl, buffer, size, typename(type)) < 0) {
+		if (check_sha1_signature(r, repl, buffer, size, typename(type)) < 0) {
 			free(buffer);
 			error("sha1 mismatch %s", sha1_to_hex(repl));
 			return NULL;
 		}
 
-		obj = parse_object_buffer(the_repository, oid, type, size,
+		obj = parse_object_buffer(r, oid, type, size,
 					  buffer, &eaten);
 		if (!eaten)
 			free(buffer);
diff --git a/object.h b/object.h
index a5456fc2d7..900f1b6611 100644
--- a/object.h
+++ b/object.h
@@ -160,8 +160,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
  *
  * Returns NULL if the object is missing or corrupt.
  */
-#define parse_object(r, oid) parse_object_##r(oid)
-struct object *parse_object_the_repository(const struct object_id *oid);
+struct object *parse_object(struct repository *r, const struct object_id *oid);
 
 /*
  * Like parse_object, but will die() instead of returning NULL. If the
-- 
2.15.1.433.g936d1b9894.dirty