]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'js/larger-timestamps'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
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

16 files changed:
1  2 
archive-zip.c
builtin/am.c
builtin/fsck.c
builtin/gc.c
builtin/receive-pack.c
builtin/worktree.c
cache.h
config.c
fetch-pack.c
git-compat-util.h
refs.c
refs.h
refs/files-backend.c
t/helper/test-ref-store.c
t/test-lib.sh
wt-status.c

diff --cc archive-zip.c
Simple merge
diff --cc builtin/am.c
Simple merge
diff --cc builtin/fsck.c
Simple merge
diff --cc builtin/gc.c
Simple merge
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge
diff --cc fetch-pack.c
Simple merge
Simple merge
diff --cc refs.c
Simple merge
diff --cc refs.h
Simple merge
Simple merge
Simple merge
diff --cc t/test-lib.sh
Simple merge
diff --cc wt-status.c
Simple merge