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 /replace-object.h | |
| parent | Merge branch 'jh/json-writer' (diff) | |
| parent | add core.usereplacerefs config option (diff) | |
| download | tgif-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.xz | |
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 '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; |