diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-15 22:08:23 (GMT) |
| commit | 1689c22c1c328e9135ed51458e9f9a5d224c5057 (patch) | |
| tree | 774db619c960df03d49743e5f0bf06b34a8dcc0c /replace-object.c | |
| parent | a14a9bfc132f8fe80cca33d14b1acbcda945de13 (diff) | |
| parent | da4398d6a03eb2cf857aa63190e9bf60305befd2 (diff) | |
| download | git-1689c22c1c328e9135ed51458e9f9a5d224c5057.zip git-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.gz git-1689c22c1c328e9135ed51458e9f9a5d224c5057.tar.bz2 | |
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.c')
| -rw-r--r-- | replace-object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/replace-object.c b/replace-object.c index 801b5c1..4162df6 100644 --- a/replace-object.c +++ b/replace-object.c @@ -51,7 +51,7 @@ static void prepare_replace_object(struct repository *r) * replacement object's name (replaced recursively, if necessary). * The return value is either oid or a pointer to a * permanently-allocated value. This function always respects replace - * references, regardless of the value of check_replace_refs. + * references, regardless of the value of read_replace_refs. */ const struct object_id *do_lookup_replace_object(struct repository *r, const struct object_id *oid) |