Merge branch 'js/larger-timestamps'

A follow-up hotfix for a topic already in 'master'.

* js/larger-timestamps:
name-rev: change a "long" variable to timestamp_t

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 663e26ebbdc49071d1fb6e2b289cd8f51841c688..7fc7e66e8500b82cbfecc21a1dce77e09de28ab0 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -16,7 +16,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