Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/larger-timestamps'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 30 May 2017 02:16:45 +0000
(11:16 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 30 May 2017 02:16:45 +0000
(11:16 +0900)
A follow-up hotfix for a topic already in 'master'.
* js/larger-timestamps:
name-rev: change a "long" variable to timestamp_t
1
2
builtin/name-rev.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
663bf04
5589e87
)
diff --cc
builtin/name-rev.c
index 663e26ebbdc49071d1fb6e2b289cd8f51841c688,1f6fcae1215847ed6665c72cef4cf7a0ca5a5234..7fc7e66e8500b82cbfecc21a1dce77e09de28ab0
---
1
/
builtin/name-rev.c
---
2
/
builtin/name-rev.c
+++ b/
builtin/name-rev.c
@@@
-13,10
-13,9
+13,10
@@@
typedef struct rev_name
timestamp_t taggerdate;
int generation;
int distance;
+ int from_tag;
} rev_name;
- static
long cutoff = LONG
_MAX;
+ static
timestamp_t cutoff = TIME
_MAX;
/* How many generations are maximally preferred over _one_ merge traversal? */
#define MERGE_TRAVERSAL_WEIGHT 65535