builtin/commit-graph.c: introduce split strategy 'no-merge'

[thirdparty/git.git] / replace-object.h

diff --git a/replace-object.h b/replace-object.h
index f996de3d62c6aaa9d30792e5347613ff1f63fbe0..04ed7a85a2402d64e715c38850a41bea43d0f3b3 100644 (file)
--- a/replace-object.h
+++ b/replace-object.h
@@ -10,12 +10,14 @@ struct replace_object {
        struct object_id replacement;
 };
 
+void prepare_replace_object(struct repository *r);
+
 /*
  * 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(struct repository *r,
-                                                       const struct object_id *oid);
+const struct object_id *do_lookup_replace_object(struct repository *r,
+                                                const struct object_id *oid);
 
 /*
  * If object sha1 should be replaced, return the replacement object's
@@ -26,7 +28,7 @@ extern const struct object_id *do_lookup_replace_object(struct repository *r,
 static inline const struct object_id *lookup_replace_object(struct repository *r,
                                                            const struct object_id *oid)
 {
-       if (!check_replace_refs ||
+       if (!read_replace_refs ||
            (r->objects->replace_map &&
             r->objects->replace_map->map.tablesize == 0))
                return oid;