Merge branch 'pb/ref-filter-with-crlf'

[thirdparty/git.git] / commit-graph.h

diff --git a/commit-graph.h b/commit-graph.h
index 09a97030dcd8a2ea570da097d6f27a5d0cbaf934..f8e92500c6e4bc004c9945b29d27da89319d0bd0 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -25,6 +25,7 @@ struct raw_object_store;
 struct string_list;
 
 char *get_commit_graph_filename(struct object_directory *odb);
+char *get_commit_graph_chain_filename(struct object_directory *odb);
 int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
 
 /*
@@ -75,11 +76,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
@@ -87,6 +90,8 @@ struct commit_graph *parse_commit_graph(void *graph_map, size_t graph_size);
  */
 int generation_numbers_enabled(struct repository *r);
 
+struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r);
+
 enum commit_graph_write_flags {
        COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
        COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
@@ -101,11 +106,12 @@ enum commit_graph_split_flags {
        COMMIT_GRAPH_SPLIT_REPLACE          = 2
 };
 
-struct split_commit_graph_opts {
+struct commit_graph_opts {
        int size_multiple;
        int max_commits;
        timestamp_t expire_time;
-       enum commit_graph_split_flags flags;
+       enum commit_graph_split_flags split_flags;
+       int max_new_filters;
 };
 
 /*
@@ -116,12 +122,12 @@ struct split_commit_graph_opts {
  */
 int write_commit_graph_reachable(struct object_directory *odb,
                                 enum commit_graph_write_flags flags,
-                                const struct split_commit_graph_opts *split_opts);
+                                const struct commit_graph_opts *opts);
 int write_commit_graph(struct object_directory *odb,
                       struct string_list *pack_indexes,
                       struct oidset *commits,
                       enum commit_graph_write_flags flags,
-                      const struct split_commit_graph_opts *split_opts);
+                      const struct commit_graph_opts *opts);
 
 #define COMMIT_GRAPH_VERIFY_SHALLOW    (1 << 0)