diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:45 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:45 +0900 |
| commit | 35d802d296df4c1f9f058c4dc9c934a872df6bfe (patch) | |
| tree | 5a58c5809265db0236ac02339ed8269fffd00833 | |
| parent | 663bf0439e25a0e0926055361d201b39dddbffb4 (diff) | |
| parent | 5589e87fd8d2a74201157dad34d66fdcf7ce41a3 (diff) | |
| download | git-35d802d296df4c1f9f058c4dc9c934a872df6bfe.tar.gz | |
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
| -rw-r--r-- | builtin/name-rev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c index 663e26ebbd..7fc7e66e85 100644 --- 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 |