interpret-trailers: add options for actions

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 5c74ce249b8a6d0ba3e783febf2a1b2a200143b3..6dbd167d3b0874cd966b4590951a12d01f8f6aeb 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "refs.h"
 #include "diff.h"
@@ -132,7 +133,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;