mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
Merge branch 'ds/commit-graph-set-size-mult'
The code to write split commit-graph file(s) upon fetching computed bogus value for the parameter used in splitting the resulting files, which has been corrected. * ds/commit-graph-set-size-mult: commit-graph: prefer default size_mult when given zero
This commit is contained in:
commit
037f067587
|
@ -1866,15 +1866,13 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
|
|||
(fetch_write_commit_graph < 0 &&
|
||||
the_repository->settings.fetch_write_commit_graph)) {
|
||||
int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
|
||||
struct split_commit_graph_opts split_opts;
|
||||
memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
|
||||
|
||||
if (progress)
|
||||
commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
|
||||
|
||||
write_commit_graph_reachable(get_object_directory(),
|
||||
commit_graph_flags,
|
||||
&split_opts);
|
||||
NULL);
|
||||
}
|
||||
|
||||
close_object_store(the_repository->objects);
|
||||
|
|
|
@ -1542,7 +1542,9 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
|
|||
|
||||
if (ctx->split_opts) {
|
||||
max_commits = ctx->split_opts->max_commits;
|
||||
size_mult = ctx->split_opts->size_multiple;
|
||||
|
||||
if (ctx->split_opts->size_multiple)
|
||||
size_mult = ctx->split_opts->size_multiple;
|
||||
}
|
||||
|
||||
g = ctx->r->objects->commit_graph;
|
||||
|
|
Loading…
Reference in a new issue