Merge pull request #5766 from lhchavez/cgraph-generation-cmp

ethomson · web-flow · commit 08c79128be38 · 2021-07-27T10:18:52.000-04:00
commit-graph: Introduce `git_commit_list_generation_cmp`
diff --git a/src/commit_list.c b/src/commit_list.c
@@ -12,6 +12,24 @@
 #include "odb.h"
 #include "commit.h"
 
+int git_commit_list_generation_cmp(const void *a, const void *b)
+{
+	uint32_t generation_a = ((git_commit_list_node *) a)->generation;
+	uint32_t generation_b = ((git_commit_list_node *) b)->generation;
+
+	if (!generation_a || !generation_b) {
+		/* Fall back to comparing by timestamps if at least one commit lacks a generation. */
+		return git_commit_list_time_cmp(a, b);
+	}
+
+	if (generation_a < generation_b)
+		return 1;
+	if (generation_a > generation_b)
+		return -1;
+
+	return 0;
+}
+
 int git_commit_list_time_cmp(const void *a, const void *b)
 {
 	int64_t time_a = ((git_commit_list_node *) a)->time;
diff --git a/src/commit_list.h b/src/commit_list.h
@@ -46,6 +46,7 @@ typedef struct git_commit_list {
 } git_commit_list;
 
 git_commit_list_node *git_commit_list_alloc_node(git_revwalk *walk);
+int git_commit_list_generation_cmp(const void *a, const void *b);
 int git_commit_list_time_cmp(const void *a, const void *b);
 void git_commit_list_free(git_commit_list **list_p);
 git_commit_list *git_commit_list_insert(git_commit_list_node *item, git_commit_list **list_p);
diff --git a/src/graph.c b/src/graph.c
@@ -43,7 +43,7 @@ static int mark_parents(git_revwalk *walk, git_commit_list_node *one,
 		return 0;
 	}
 
-	if (git_pqueue_init(&list, 0, 2, git_commit_list_time_cmp) < 0)
+	if (git_pqueue_init(&list, 0, 2, git_commit_list_generation_cmp) < 0)
 		return -1;
 
 	if (git_commit_list_parse(walk, one) < 0)
diff --git a/src/merge.c b/src/merge.c
@@ -387,7 +387,7 @@ static int paint_down_to_common(
 	int error;
 	unsigned int i;
 
-	if (git_pqueue_init(&list, 0, twos->length * 2, git_commit_list_time_cmp) < 0)
+	if (git_pqueue_init(&list, 0, twos->length * 2, git_commit_list_generation_cmp) < 0)
 		return -1;
 
 	one->flags |= PARENT1;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ static int mark_parents(git_revwalk walk, git_commit_list_node one,`
`43`	`43`	`return 0;`
`44`	`44`	`}`
`45`	`45`
`46`		`- if (git_pqueue_init(&list, 0, 2, git_commit_list_time_cmp) < 0)`
	`46`	`+ if (git_pqueue_init(&list, 0, 2, git_commit_list_generation_cmp) < 0)`
`47`	`47`	`return -1;`
`48`	`48`
`49`	`49`	`if (git_commit_list_parse(walk, one) < 0)`