mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mg/timestamp-t-fix'
A mismerge fix. * mg/timestamp-t-fix: name-rev: change ULONG_MAX to TIME_MAX
This commit is contained in:
commit
eb066429e7
|
@ -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;
|
struct commit *commit = (struct commit *)o;
|
||||||
int from_tag = starts_with(path, "refs/tags/");
|
int from_tag = starts_with(path, "refs/tags/");
|
||||||
|
|
||||||
if (taggerdate == ULONG_MAX)
|
if (taggerdate == TIME_MAX)
|
||||||
taggerdate = ((struct commit *)o)->date;
|
taggerdate = ((struct commit *)o)->date;
|
||||||
path = name_ref_abbrev(path, can_abbreviate_output);
|
path = name_ref_abbrev(path, can_abbreviate_output);
|
||||||
name_rev(commit, xstrdup(path), taggerdate, 0, 0,
|
name_rev(commit, xstrdup(path), taggerdate, 0, 0,
|
||||||
|
|
Loading…
Reference in a new issue