mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/larger-timestamps'
A follow-up hotfix for a topic already in 'master'. * js/larger-timestamps: name-rev: change a "long" variable to timestamp_t
This commit is contained in:
commit
35d802d296
|
@ -16,7 +16,7 @@ typedef struct rev_name {
|
|||
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
|
||||
|
|
Loading…
Reference in a new issue