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 --- replace-object.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'replace-object.h') diff --git a/replace-object.h b/replace-object.h index f9a2b70eb8..15315311fb 100644 --- a/replace-object.h +++ b/replace-object.h @@ -1,9 +1,31 @@ #ifndef REPLACE_OBJECT_H #define REPLACE_OBJECT_H +#include "oidmap.h" +#include "repository.h" + struct replace_object { struct oidmap_entry original; struct object_id replacement; }; +/* + * 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); +} + #endif /* REPLACE_OBJECT_H */ -- cgit v1.2.3