diff options
Diffstat (limited to 'replace-object.h')
| -rw-r--r-- | replace-object.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/replace-object.h b/replace-object.h index f996de3d62..04ed7a85a2 100644 --- 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; |