Merge branch 'jk/mailmap-only-at-root'

[thirdparty/git.git] / commit.c

diff --git a/commit.c b/commit.c
index fd2831dad3243f32f5bae472f2af6ad15019c67d..4694c4cf9bca07a4e86a9d9701053c9185df9ebd 100644 (file)
--- 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)