diff options
author | Derrick Stolee <derrickstolee@github.com> | 2023-06-06 13:24:36 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-06-12 13:34:55 -0700 |
commit | f1178380ac645684fcf0519488f9336e55f0946f (patch) | |
tree | 09541fae847ee0640c6db5aa5b48dc639f5a708e /commit-graph.c | |
parent | d24eda4e03cabbd39ce06827d47e52a97b9095db (diff) | |
download | git-f1178380ac645684fcf0519488f9336e55f0946f.tar.gz |
replace-objects: create wrapper around setting
The 'read_replace_objects' constant is initialized by git_default_config
(if core.useReplaceRefs is disabled) and within setup_git_env (if
GIT_NO_REPLACE_OBJECTS) is set. To ensure that this variable cannot be
set accidentally in other places, wrap it in a replace_refs_enabled()
method.
Since we still assign this global in config.c, we are not able to remove
the global scope of this variable and make it a static within
replace-object.c. This will happen in a later change which will also
prevent the variable from being read before it is initialized.
Centralizing read access to the variable is an important first step.
Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
-rw-r--r-- | commit-graph.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/commit-graph.c b/commit-graph.c index 43558b4d9b..95873317bf 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -203,14 +203,12 @@ static struct commit_graph *alloc_commit_graph(void) return g; } -extern int read_replace_refs; - static int commit_graph_compatible(struct repository *r) { if (!r->gitdir) return 0; - if (read_replace_refs) { + if (replace_refs_enabled(r)) { prepare_replace_object(r); if (hashmap_get_size(&r->objects->replace_map->map)) return 0; |