path: root/commit.c
diff options
authorJunio C Hamano <>2021-02-18 01:21:40 (GMT)
committerJunio C Hamano <>2021-02-18 01:21:40 (GMT)
commit8b4701ae4fa8e68362509013ceb496333b7ca0df (patch)
tree3f34f7368739f10ec4c776d6b2a8d7345479c8d6 /commit.c
parent328c10930387d301560f7cbcd3351cc485a13381 (diff)
parent5a3b130cad0d5c770f766e3af6d32b41766374c0 (diff)
Merge branch 'ak/corrected-commit-date'
The commit-graph learned to use corrected commit dates instead of the generation number to help topological revision traversal. * ak/corrected-commit-date: doc: add corrected commit date info commit-reach: use corrected commit dates in paint_down_to_common() commit-graph: use generation v2 only if entire chain does commit-graph: implement generation data chunk commit-graph: implement corrected commit date commit-graph: return 64-bit generation number commit-graph: add a slab to store topological levels t6600-test-reach: generalize *_three_modes commit-graph: consolidate fill_commit_graph_info revision: parse parent in indegree_walk_step() commit-graph: fix regression when computing Bloom filters
Diffstat (limited to 'commit.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index fd2831d..4694c4c 100644
--- a/commit.c
+++ b/commit.c
@@ -753,8 +753,8 @@ int compare_commits_by_author_date(const void *a_, const void *b_,
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
const struct commit *a = a_, *b = b_;
- const uint32_t generation_a = commit_graph_generation(a),
- generation_b = commit_graph_generation(b);
+ const timestamp_t generation_a = commit_graph_generation(a),
+ generation_b = commit_graph_generation(b);
/* newer commits first */
if (generation_a < generation_b)