commit-graph: rename commit_compare to oid_compare

derrickstolee · gitster · commit 3cbc6ed3ee02 · 2019-06-19T20:46:26.000-07:00
The helper function commit_compare() actually compares object_id
structs, not commits. A future change to commit-graph.c will need
to sort commit structs, so rename this function in advance.

Signed-off-by: Derrick Stolee &lt;dstolee@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/commit-graph.c b/commit-graph.c
@@ -770,7 +770,7 @@ static void write_graph_chunk_extra_edges(struct hashfile *f,
 	}
 }
 
-static int commit_compare(const void *_a, const void *_b)
+static int oid_compare(const void *_a, const void *_b)
 {
 	const struct object_id *a = (const struct object_id *)_a;
 	const struct object_id *b = (const struct object_id *)_b;
@@ -1039,7 +1039,7 @@ static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)
 			_("Counting distinct commits in commit graph"),
 			ctx->oids.nr);
 	display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */
-	QSORT(ctx->oids.list, ctx->oids.nr, commit_compare);
+	QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);
 
 	for (i = 1; i < ctx->oids.nr; i++) {
 		display_progress(ctx->progress, i + 1);

Original file line number	Diff line number	Diff line change
`@@ -770,7 +770,7 @@ static void write_graph_chunk_extra_edges(struct hashfile *f,`
`770`	`770`	`}`
`771`	`771`	`}`
`772`	`772`
`773`		`-static int commit_compare(const void _a, const void _b)`
	`773`	`+static int oid_compare(const void _a, const void _b)`
`774`	`774`	`{`
`775`	`775`	`const struct object_id a = (const struct object_id )_a;`
`776`	`776`	`const struct object_id b = (const struct object_id )_b;`
`@@ -1039,7 +1039,7 @@ static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)`
`1039`	`1039`	`_("Counting distinct commits in commit graph"),`
`1040`	`1040`	`ctx->oids.nr);`
`1041`	`1041`	`display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */`
`1042`		`- QSORT(ctx->oids.list, ctx->oids.nr, commit_compare);`
	`1042`	`+ QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);`
`1043`	`1043`
`1044`	`1044`	`for (i = 1; i < ctx->oids.nr; i++) {`
`1045`	`1045`	`display_progress(ctx->progress, i + 1);`