summaryrefslogtreecommitdiff
path: root/builtin/name-rev.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-30 02:16:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-30 02:16:45 (GMT)
commit35d802d296df4c1f9f058c4dc9c934a872df6bfe (patch)
tree5a58c5809265db0236ac02339ed8269fffd00833 /builtin/name-rev.c
parent663bf0439e25a0e0926055361d201b39dddbffb4 (diff)
parent5589e87fd8d2a74201157dad34d66fdcf7ce41a3 (diff)
downloadgit-35d802d296df4c1f9f058c4dc9c934a872df6bfe.zip
git-35d802d296df4c1f9f058c4dc9c934a872df6bfe.tar.gz
git-35d802d296df4c1f9f058c4dc9c934a872df6bfe.tar.bz2
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
Diffstat (limited to 'builtin/name-rev.c')
-rw-r--r--builtin/name-rev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 663e26e..7fc7e66 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