diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2021-02-25 18:19:42 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-02-25 15:10:40 -0800 |
| commit | c7ef8fe608819f05526408c741719589599a544a (patch) | |
| tree | c7ee83ec81bdb9e227cd32c31f5ce9396b7c922f | |
| parent | commit-graph.c: display correct number of chunks when writing (diff) | |
| download | tgif-c7ef8fe608819f05526408c741719589599a544a.tar.xz | |
commit-graph: create local repository pointer
The write_commit_graph() method uses 'the_repository' in a few places. A
new need for a repository pointer is coming in the following change, so
group these instances into a local variable 'r' that could eventually
become part of the method signature, if so desired.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | commit-graph.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/commit-graph.c b/commit-graph.c index b9efeddeab..8b07a9a0a6 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -2155,6 +2155,7 @@ int write_commit_graph(struct object_directory *odb, enum commit_graph_write_flags flags, const struct commit_graph_opts *opts) { + struct repository *r = the_repository; struct write_commit_graph_context *ctx; uint32_t i; int res = 0; @@ -2162,16 +2163,16 @@ int write_commit_graph(struct object_directory *odb, struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS; struct topo_level_slab topo_levels; - prepare_repo_settings(the_repository); - if (!the_repository->settings.core_commit_graph) { + prepare_repo_settings(r); + if (!r->settings.core_commit_graph) { warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled")); return 0; } - if (!commit_graph_compatible(the_repository)) + if (!commit_graph_compatible(r)) return 0; ctx = xcalloc(1, sizeof(struct write_commit_graph_context)); - ctx->r = the_repository; + ctx->r = r; ctx->odb = odb; ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0; ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0; |