| 2446 | } |
| 2447 | |
| 2448 | static void merge_commit_graphs(struct write_commit_graph_context *ctx, |
| 2449 | struct commit_graph *g) |
| 2450 | { |
| 2451 | uint32_t current_graph_number = ctx->num_commit_graphs_before; |
| 2452 | |
| 2453 | while (g && current_graph_number >= ctx->num_commit_graphs_after) { |
| 2454 | current_graph_number--; |
| 2455 | |
| 2456 | if (ctx->report_progress) |
| 2457 | ctx->progress = start_delayed_progress(ctx->r, |
| 2458 | _("Merging commit-graph"), 0); |
| 2459 | |
| 2460 | merge_commit_graph(ctx, g); |
| 2461 | stop_progress(&ctx->progress); |
| 2462 | |
| 2463 | g = g->base_graph; |
| 2464 | } |
| 2465 | |
| 2466 | if (g) { |
| 2467 | ctx->new_base_graph = g; |
| 2468 | ctx->new_num_commits_in_base = g->num_commits + g->num_commits_in_base; |
| 2469 | } |
| 2470 | |
| 2471 | if (ctx->new_base_graph) |
| 2472 | ctx->base_graph_name = xstrdup(ctx->new_base_graph->filename); |
| 2473 | |
| 2474 | sort_and_scan_merged_commits(ctx); |
| 2475 | } |
| 2476 | |
| 2477 | static void mark_commit_graphs(struct write_commit_graph_context *ctx) |
| 2478 | { |
no test coverage detected