object: allow object_as_type to handle arbitrary repositories

stefanbeller · gitster · commit a962da1ef59c · 2018-06-29T10:43:39.000-07:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/object.c b/object.c
@@ -158,13 +158,13 @@ void *create_object(struct repository *r, const unsigned char *sha1, void *o)
 	return obj;
 }
 
-void *object_as_type_the_repository(struct object *obj, enum object_type type, int quiet)
+void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet)
 {
 	if (obj->type == type)
 		return obj;
 	else if (obj->type == OBJ_NONE) {
 		if (type == OBJ_COMMIT)
-			((struct commit *)obj)->index = alloc_commit_index(the_repository);
+			((struct commit *)obj)->index = alloc_commit_index(r);
 		obj->type = type;
 		return obj;
 	}
diff --git a/object.h b/object.h
@@ -114,8 +114,7 @@ struct object *lookup_object_the_repository(const unsigned char *sha1);
 
 extern void *create_object(struct repository *r, const unsigned char *sha1, void *obj);
 
-#define object_as_type(r, o, t, q) object_as_type_##r(o, t, q)
-void *object_as_type_the_repository(struct object *obj, enum object_type type, int quiet);
+void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
 
 /*
  * Returns the object, having parsed it to find out what it is.

Original file line number	Diff line number	Diff line change
`@@ -158,13 +158,13 @@ void create_object(struct repository r, const unsigned char sha1, void o)`
`158`	`158`	`return obj;`
`159`	`159`	`}`
`160`	`160`
`161`		`-void object_as_type_the_repository(struct object obj, enum object_type type, int quiet)`
	`161`	`+void object_as_type(struct repository r, struct object *obj, enum object_type type, int quiet)`
`162`	`162`	`{`
`163`	`163`	`if (obj->type == type)`
`164`	`164`	`return obj;`
`165`	`165`	`else if (obj->type == OBJ_NONE) {`
`166`	`166`	`if (type == OBJ_COMMIT)`
`167`		`- ((struct commit *)obj)->index = alloc_commit_index(the_repository);`
	`167`	`+ ((struct commit *)obj)->index = alloc_commit_index(r);`
`168`	`168`	`obj->type = type;`
`169`	`169`	`return obj;`
`170`	`170`	`}`