Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-04-12 03:21:06 +0300
committerJunio C Hamano <gitster@pobox.com>2018-04-12 05:38:56 +0300
commit47f351e9b328cd828d85c45a736eca252152aa5c (patch)
treebbbd9079f1f94cc617ba49002cda8e5bae0a3ccd /cache.h
parentd88f9fdf8b2ccf65993bb977094ab9b2249635ee (diff)
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 <sbeller@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h19
1 files changed, 0 insertions, 19 deletions
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 *);