timestamp_t: a new data type for timestamps

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index cfe2a796f85ecf8dfbbb35d3232893929670b492..8ed96391c1d4d07c6a5944dd2dd7a70ca2565313 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -132,7 +132,7 @@ static void add_one_commit(struct object_id *oid, struct rev_collect *revs)
 }
 
 static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
-                                 const char *ident, unsigned long timestamp,
+                                 const char *ident, timestamp_t timestamp,
                                  int tz, const char *message, void *cbdata)
 {
        struct rev_collect *revs = cbdata;