]> git.ipfire.org Git - thirdparty/git.git/commitdiff
commit-graph: create local repository pointer
authorDerrick Stolee <dstolee@microsoft.com>
Thu, 25 Feb 2021 18:19:42 +0000 (18:19 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Feb 2021 23:10:40 +0000 (15:10 -0800)
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>
commit-graph.c

index b9efeddeab6c3d0ef1eb2110b2b4ed8addbd5b3d..8b07a9a0a6dfc1952c193ab2c1aaf7c5e646739b 100644 (file)
@@ -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;