Merge branch 'js/larger-timestamps'

diff --git a/commit.c b/commit.c
index 30d1af2b20660de99bed06486c11d1aef3763849..1a6e632185346f518ed389f2d479c807a5f49927 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -656,7 +656,7 @@ struct commit *pop_commit(struct commit_list **stack)
 define_commit_slab(indegree_slab, int);
 
 /* record author-date for each commit object */
-define_commit_slab(author_date_slab, unsigned long);
+define_commit_slab(author_date_slab, timestamp_t);
 
 static void record_author_date(struct author_date_slab *author_date,
                               struct commit *commit)