From: Alex Henrie Date: Tue, 1 Oct 2019 02:29:34 +0000 (-0600) Subject: commit-graph: remove a duplicate assignment X-Git-Tag: v2.24.0-rc0~47^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8da02ce62a4e76aea7a02d56b66b10eedc8e6db8;p=thirdparty%2Fgit.git commit-graph: remove a duplicate assignment Leave the variable 'g' uninitialized before it is set just before its first use in front of a loop, which is a much more appropriate place to indicate what it is used for. Also initialize the variable 'num_commits' just before the loop instead of at the beginning of the function for the same reason. Reviewed-by: Derrick Stolee Signed-off-by: Alex Henrie Signed-off-by: Junio C Hamano --- diff --git a/commit-graph.c b/commit-graph.c index fe954ab5f8..9a65ddd684 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1519,8 +1519,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx) static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) { - struct commit_graph *g = ctx->r->objects->commit_graph; - uint32_t num_commits = ctx->commits.nr; + struct commit_graph *g; + uint32_t num_commits; uint32_t i; int max_commits = 0; @@ -1532,6 +1532,7 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) } g = ctx->r->objects->commit_graph; + num_commits = ctx->commits.nr; ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; while (g && (g->num_commits <= size_mult * num_commits ||