From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 30 May 2017 02:16:45 +0000 (+0900)
Subject: Merge branch 'js/larger-timestamps'
X-Git-Tag: v2.14.0-rc0~137
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35d802d296df4c1f9f058c4dc9c934a872df6bfe;p=thirdparty%2Fgit.git

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
---

35d802d296df4c1f9f058c4dc9c934a872df6bfe
diff --cc builtin/name-rev.c
index 663e26ebbd,1f6fcae121..7fc7e66e85
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@@ -13,10 -13,9 +13,10 @@@ typedef struct rev_name 
  	timestamp_t taggerdate;
  	int generation;
  	int distance;
 +	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