diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-23 02:29:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-23 02:29:06 +0300 |
| commit | d9f9f6b358c4d8aad492bc4995be0926048a6248 (patch) | |
| tree | 62cf18a137ffecb83675d7d5dda4f2f43d33253d /log-tree.c | |
| parent | f2ffc7418685f75e43e2919426276141fd62c656 (diff) | |
| parent | 9c7d1b057ff36ee4190621d46e9fe3c83377aea7 (diff) | |
Merge branch 'ds/disable-replace-refs'
Introduce a mechanism to disable replace refs globally and per
repository.
* ds/disable-replace-refs:
repository: create read_replace_refs setting
replace-objects: create wrapper around setting
repository: create disable_replace_refs()
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 f4b22a60cc..48468087af 100644 --- a/log-tree.c +++ b/log-tree.c @@ -156,7 +156,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 (!read_replace_refs) + if (!replace_refs_enabled(the_repository)) return 0; if (get_oid_hex(refname + strlen(git_replace_ref_base), &original_oid)) { |