Merge branch 'jk/warn-add-gitlink'

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 663e26ebbdc49071d1fb6e2b289cd8f51841c688..e21715f1d0874171bcda2486adb4d27ea5cbbc99 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -1,5 +1,6 @@
 #include "builtin.h"
 #include "cache.h"
+#include "config.h"
 #include "commit.h"
 #include "tag.h"
 #include "refs.h"
@@ -16,7 +17,7 @@ typedef struct rev_name {
        int from_tag;
 } rev_name;
 
-static long cutoff = LONG_MAX;
+static timestamp_t cutoff = TIME_MAX;
 
 /* How many generations are maximally preferred over _one_ merge traversal? */
 #define MERGE_TRAVERSAL_WEIGHT 65535