diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 15:08:23 -0700 |
| commit | 1689c22c1c328e9135ed51458e9f9a5d224c5057 (patch) | |
| tree | 774db619c960df03d49743e5f0bf06b34a8dcc0c /log-tree.c | |
| parent | a14a9bfc132f8fe80cca33d14b1acbcda945de13 (diff) | |
| parent | da4398d6a03eb2cf857aa63190e9bf60305befd2 (diff) | |
| download | git-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.gz | |
Merge branch 'jk/core-use-replace-refs'
A new configuration variable core.usereplacerefs has been added,
primarily to help server installations that want to ignore the
replace mechanism altogether.
* jk/core-use-replace-refs:
add core.usereplacerefs config option
check_replace_refs: rename to read_replace_refs
check_replace_refs: fix outdated comment
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 c0ac7af7cb..7443e5fcc7 100644 --- a/log-tree.c +++ b/log-tree.c @@ -92,7 +92,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)) { |