Skip to content

Commit a5df4d5

Browse files
committed
Merge branch 'mg/timestamp-t-fix' into next
A mismerge fix. * mg/timestamp-t-fix: name-rev: change ULONG_MAX to TIME_MAX
2 parents 96c403f + 5554451 commit a5df4d5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/name-rev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
253253
struct commit *commit = (struct commit *)o;
254254
int from_tag = starts_with(path, "refs/tags/");
255255

256-
if (taggerdate == ULONG_MAX)
256+
if (taggerdate == TIME_MAX)
257257
taggerdate = ((struct commit *)o)->date;
258258
path = name_ref_abbrev(path, can_abbreviate_output);
259259
name_rev(commit, xstrdup(path), taggerdate, 0, 0,

0 commit comments

Comments
 (0)