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 /log-tree.c | |
| parent | 72470aa38ad786697118157e69174ba7ff85bfa3 (diff) | |
| download | git-6ebd1cafe2bb1dee34e106a8da3ee173b36259d3.tar.gz | |
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 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 4a3907fea0..ec3a689c6a 100644 --- a/log-tree.c +++ b/log-tree.c @@ -91,7 +91,7 @@ static int add_ref_decoration(const char *refname, const struct object_id *oid, if (starts_with(refname, git_replace_ref_base)) { struct object_id original_oid; - if (!check_replace_refs) + if (!read_replace_refs) return 0; if (get_oid_hex(refname + strlen(git_replace_ref_base), &original_oid)) { |