From 6ebd1cafe2bb1dee34e106a8da3ee173b36259d3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 18 Jul 2018 16:45:20 -0400 Subject: check_replace_refs: rename to read_replace_refs This was added as a NEEDSWORK in c3c36d7de2 (replace-object: check_replace_refs is safe in multi repo environment, 2018-04-11), waiting for a calmer period. Since doing so now doesn't conflict with anything in 'pu', it seems as good a time as any. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- replace-object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'replace-object.h') diff --git a/replace-object.h b/replace-object.h index f996de3d62..9345e105dd 100644 --- a/replace-object.h +++ b/replace-object.h @@ -26,7 +26,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; -- cgit v1.2.3