From 47f351e9b328cd828d85c45a736eca252152aa5c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 11 Apr 2018 17:21:06 -0700 Subject: object-store: move lookup_replace_object to replace-object.h lookup_replace_object is a low-level function that most users of the object store do not need to use directly. Move it to replace-object.h to avoid a dependency loop in an upcoming change to its inline definition that will make use of repository.h. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- cache.h | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index bbaf5c349a..027bd7ffc8 100644 --- a/cache.h +++ b/cache.h @@ -1191,25 +1191,6 @@ static inline void *read_object_file(const struct object_id *oid, enum object_ty return read_object_file_extended(oid, type, size, 1); } -/* - * This internal function is only declared here for the benefit of - * lookup_replace_object(). Please do not call it directly. - */ -extern const struct object_id *do_lookup_replace_object(const struct object_id *oid); - -/* - * If object sha1 should be replaced, return the replacement object's - * name (replaced recursively, if necessary). The return value is - * either sha1 or a pointer to a permanently-allocated value. When - * object replacement is suppressed, always return sha1. - */ -static inline const struct object_id *lookup_replace_object(const struct object_id *oid) -{ - if (!check_replace_refs) - return oid; - return do_lookup_replace_object(oid); -} - /* Read and unpack an object file into memory, write memory to an object file */ extern int oid_object_info(const struct object_id *, unsigned long *); -- cgit 1.2.3-korg