Merge branch 'js/larger-timestamps'
Some platforms have ulong that is smaller than time_t, and our historical use of ulong for timestamp would mean they cannot represent some timestamp that the platform allows. Invent a separate and dedicated timestamp_t (so that we can distingiuish timestamps and a vanilla ulongs, which along is already a good move), and then declare uintmax_t is the type to be used as the timestamp_t. * js/larger-timestamps: archive-tar: fix a sparse 'constant too large' warning use uintmax_t for timestamps date.c: abort if the system time cannot handle one of our timestamps timestamp_t: a new data type for timestamps PRItime: introduce a new "printf format" for timestamps parse_timestamp(): specify explicitly where we parse timestamps t0006 & t5000: skip "far in the future" test when time_t is too limited t0006 & t5000: prepare for 64-bit timestamps ref-filter: avoid using `unsigned long` for catch-all data type
This commit is contained in:
@ -394,8 +394,8 @@ static int find_common(struct fetch_pack_args *args,
|
||||
if (args->depth > 0)
|
||||
packet_buf_write(&req_buf, "deepen %d", args->depth);
|
||||
if (args->deepen_since) {
|
||||
unsigned long max_age = approxidate(args->deepen_since);
|
||||
packet_buf_write(&req_buf, "deepen-since %lu", max_age);
|
||||
timestamp_t max_age = approxidate(args->deepen_since);
|
||||
packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age);
|
||||
}
|
||||
if (args->deepen_not) {
|
||||
int i;
|
||||
@ -583,7 +583,7 @@ static int mark_complete_oid(const char *refname, const struct object_id *oid,
|
||||
}
|
||||
|
||||
static void mark_recent_complete_commits(struct fetch_pack_args *args,
|
||||
unsigned long cutoff)
|
||||
timestamp_t cutoff)
|
||||
{
|
||||
while (complete && cutoff <= complete->item->date) {
|
||||
print_verbose(args, _("Marking %s as complete"),
|
||||
@ -670,7 +670,7 @@ static int everything_local(struct fetch_pack_args *args,
|
||||
{
|
||||
struct ref *ref;
|
||||
int retval;
|
||||
unsigned long cutoff = 0;
|
||||
timestamp_t cutoff = 0;
|
||||
|
||||
save_commit_buffer = 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user