Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mg/timestamp-t-fix' into next
author
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:28:06 +0000
(17:28 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Sun, 10 Sep 2017 08:28:06 +0000
(17:28 +0900)
A mismerge fix.
* mg/timestamp-t-fix:
name-rev: change ULONG_MAX to TIME_MAX
builtin/name-rev.c
patch
|
blob
|
history
raw
(from parent 1:
96c403f
)
diff --git
a/builtin/name-rev.c
b/builtin/name-rev.c
index c41ea7c2a62ba868061884e511256c24f4d020d9..598da6c8bc75e9de50f85eac78d3051f27f96a6c 100644
(file)
--- 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,