development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mg/timestamp-t-fix' into maint

Browse source 
A mismerge fix.

* mg/timestamp-t-fix:
  name-rev: change ULONG_MAX to TIME_MAX
This commit is contained in:
Junio C Hamano 2017-10-18 14:19:09 +09:00
commit 0445bd7b55
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/name-rev.c
View file

@ -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,