Merge branch 'ds/commit-graph-octopus-fix'

diff --git a/commit-graph.c b/commit-graph.c
index b3c4de79b6da4502726dbec5e21b11734d76e28e..90fdee9256977ad4626737b5acbd4d4e6c0ad48d 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1636,7 +1636,7 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
                                num_parents++;
 
                        if (num_parents > 2)
-                               ctx->num_extra_edges += num_parents - 2;
+                               ctx->num_extra_edges += num_parents - 1;
                }
        }