Merge branch 'bc/object-id'

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 5c74ce249b8a6d0ba3e783febf2a1b2a200143b3..0c36a70ad8f4dba1744ba6c4fa93389e2b796925 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;