diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-19 04:47:52 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-19 04:47:52 +0300 |
| commit | eb066429e7828496488d5bfbc496221b88e21377 (patch) | |
| tree | dde4fd2009c5224891d0a0b067e104fb1392101e /builtin/name-rev.c | |
| parent | c78e182d55b96b40729be83e55999a93e1499a4c (diff) | |
| parent | 5554451de61cb90e530f30b96e62d455e1eff6a1 (diff) | |
Merge branch 'mg/timestamp-t-fix'
A mismerge fix.
* mg/timestamp-t-fix:
name-rev: change ULONG_MAX to TIME_MAX
Diffstat (limited to 'builtin/name-rev.c')
| -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 c41ea7c2a6..598da6c8bc 100644 --- a/builtin/name-rev.c +++ b/builtin/name-rev.c @@ -253,7 +253,7 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo struct commit *commit = (struct commit *)o; int from_tag = starts_with(path, "refs/tags/"); - if (taggerdate == ULONG_MAX) + if (taggerdate == TIME_MAX) taggerdate = ((struct commit *)o)->date; path = name_ref_abbrev(path, can_abbreviate_output); name_rev(commit, xstrdup(path), taggerdate, 0, 0, |