diff options
Diffstat (limited to 'commit-graph.h')
| -rw-r--r-- | commit-graph.h | 21 | 
1 files changed, 10 insertions, 11 deletions
diff --git a/commit-graph.h b/commit-graph.h index 78ab7b875b..4899b54ef8 100644 --- a/commit-graph.h +++ b/commit-graph.h @@ -21,7 +21,7 @@   * call this method oustide of a builtin, and only if you know what   * you are doing!   */ -void git_test_write_commit_graph_or_die(void); +void git_test_write_commit_graph_or_die(struct odb_source *source);  struct commit;  struct bloom_filter_settings; @@ -32,7 +32,8 @@ struct string_list;  char *get_commit_graph_filename(struct odb_source *source);  char *get_commit_graph_chain_filename(struct odb_source *source);  int open_commit_graph(const char *graph_file, int *fd, struct stat *st); -int open_commit_graph_chain(const char *chain_file, int *fd, struct stat *st); +int open_commit_graph_chain(const char *chain_file, int *fd, struct stat *st, +			    const struct git_hash_algo *hash_algo);  /*   * Given a commit struct, try to fill the commit struct info, including: @@ -84,7 +85,7 @@ struct commit_graph {  	const unsigned char *data;  	size_t data_len; -	unsigned char hash_len; +	const struct git_hash_algo *hash_algo;  	unsigned char num_chunks;  	uint32_t num_commits;  	struct object_id oid; @@ -113,14 +114,12 @@ struct commit_graph {  	struct bloom_filter_settings *bloom_filter_settings;  }; -struct commit_graph *load_commit_graph_one_fd_st(struct repository *r, -						 int fd, struct stat *st, -						 struct odb_source *source); -struct commit_graph *load_commit_graph_chain_fd_st(struct repository *r, +struct commit_graph *load_commit_graph_one_fd_st(struct odb_source *source, +						 int fd, struct stat *st); +struct commit_graph *load_commit_graph_chain_fd_st(struct object_database *odb,  						   int fd, struct stat *st,  						   int *incomplete_chain); -struct commit_graph *read_commit_graph_one(struct repository *r, -					   struct odb_source *source); +struct commit_graph *read_commit_graph_one(struct odb_source *source);  struct repo_settings; @@ -128,7 +127,7 @@ struct repo_settings;   * Callers should initialize the repo_settings with prepare_repo_settings()   * prior to calling parse_commit_graph().   */ -struct commit_graph *parse_commit_graph(struct repo_settings *s, +struct commit_graph *parse_commit_graph(struct repository *r,  					void *graph_map, size_t graph_size);  /* @@ -184,7 +183,7 @@ int write_commit_graph(struct odb_source *source,  #define COMMIT_GRAPH_VERIFY_SHALLOW	(1 << 0) -int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags); +int verify_commit_graph(struct commit_graph *g, int flags);  void close_commit_graph(struct object_database *);  void free_commit_graph(struct commit_graph *);  | 
