diff options
| author |  Jeff King <peff@peff.net> | 2018-07-18 16:45:20 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 15:45:14 -0700 |
| commit | 6ebd1cafe2bb1dee34e106a8da3ee173b36259d3 (patch) | |
| tree | c2ff7f8e11494cc0f12a5c56e6b7e1e88ddfa732 /replace-object.h | |
| parent | check_replace_refs: fix outdated comment (diff) | |
| download | tgif-6ebd1cafe2bb1dee34e106a8da3ee173b36259d3.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'replace-object.h')
| -rw-r--r-- | replace-object.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |