commit-graph: pass a 'struct repository *' in more places

In a future commit, some commit-graph internals will want access to
'r->settings', but we only have the 'struct object_directory *'
corresponding to that repository.

Add an additional parameter to pass the repository around in more
places.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 523501f21743bb039df6f951975f705d6689889f..ba5584463fb0fc46e2222950106046fdd7cace79 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -106,7 +106,7 @@ static int graph_verify(int argc, const char **argv)
        FREE_AND_NULL(graph_name);
 
        if (open_ok)
-               graph = load_commit_graph_one_fd_st(fd, &st, odb);
+               graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb);
        else
                graph = read_commit_graph_one(the_repository, odb);
 

diff --git a/commit-graph.c b/commit-graph.c
index d4b06811bec068f0656df7c5e279a222203e0fb8..0c1030641cff8d94b7095bb2aba8f0e5cb0ebde4 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -224,7 +224,8 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st)
        return 1;
 }
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
+struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
+                                                int fd, struct stat *st,
                                                 struct object_directory *odb)
 {
        void *graph_map;
@@ -240,7 +241,7 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
        }
        graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
        close(fd);
-       ret = parse_commit_graph(graph_map, graph_size);
+       ret = parse_commit_graph(r, graph_map, graph_size);
 
        if (ret)
                ret->odb = odb;
@@ -280,7 +281,8 @@ static int verify_commit_graph_lite(struct commit_graph *g)
        return 0;
 }
 
-struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size)
+struct commit_graph *parse_commit_graph(struct repository *r,
+                                       void *graph_map, size_t graph_size)
 {
        const unsigned char *data, *chunk_lookup;
        uint32_t i;
@@ -445,7 +447,8 @@ free_and_return:
        return NULL;
 }
 
-static struct commit_graph *load_commit_graph_one(const char *graph_file,
+static struct commit_graph *load_commit_graph_one(struct repository *r,
+                                                 const char *graph_file,
                                                  struct object_directory *odb)
 {
 
@@ -457,7 +460,7 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file,
        if (!open_ok)
                return NULL;
 
-       g = load_commit_graph_one_fd_st(fd, &st, odb);
+       g = load_commit_graph_one_fd_st(r, fd, &st, odb);
 
        if (g)
                g->filename = xstrdup(graph_file);
@@ -469,7 +472,7 @@ static struct commit_graph *load_commit_graph_v1(struct repository *r,
                                                 struct object_directory *odb)
 {
        char *graph_name = get_commit_graph_filename(odb);
-       struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+       struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
        free(graph_name);
 
        return g;
@@ -550,7 +553,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
                valid = 0;
                for (odb = r->objects->odb; odb; odb = odb->next) {
                        char *graph_name = get_split_graph_filename(odb, line.buf);
-                       struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+                       struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
 
                        free(graph_name);
 

diff --git a/commit-graph.h b/commit-graph.h
index 0677dd1031a9d4bf9b8534b03392d9fc38140725..d9acb22bac9224012b8c373bcab4092110cd4149 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -75,11 +75,13 @@ struct commit_graph {
        struct bloom_filter_settings *bloom_filter_settings;
 };
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st,
+struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
+                                                int fd, struct stat *st,
                                                 struct object_directory *odb);
 struct commit_graph *read_commit_graph_one(struct repository *r,
                                           struct object_directory *odb);
-struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size);
+struct commit_graph *parse_commit_graph(struct repository *r,
+                                       void *graph_map, size_t graph_size);
 
 /*
  * Return 1 if and only if the repository has a commit-graph

diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c
index 430817214dcbfaadb35a3505b84a9dafa45865c8..e7cf6d5b0facb53d3e5f35d9b54ac34814d0491a 100644 (file)
--- a/fuzz-commit-graph.c
+++ b/fuzz-commit-graph.c
@@ -1,7 +1,8 @@
 #include "commit-graph.h"
 #include "repository.h"
 
-struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size);
+struct commit_graph *parse_commit_graph(struct repository *r,
+                                       void *graph_map, size_t graph_size);
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
@@ -10,7 +11,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
        struct commit_graph *g;
 
        initialize_the_repository();
-       g = parse_commit_graph((void *)data, size);
+       g = parse_commit_graph(the_repository, (void *)data, size);
        repo_clear(the_repository);
        free_commit_graph(g);