Merge branch 'jk/commit-dates-parsing-fix'

Finishing touches for portability.

* jk/commit-dates-parsing-fix:
  t4212: loosen far-in-future test for AIX
  date: recognize bogus FreeBSD gmtime output

diff --cc Makefile
index c5316a34ac4e176967ae824fccabaf4c12561ae9,da7013b1bcd3a137b42ad3fc5c42ada03e1ab8b6..f49f187516e52026388f95df6ec77e2612db7e86
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -335,9 -343,8 +335,12 @@@ all:
  # (defaults to "man") if you want to have a different default when
  # "git help" is called without a parameter specifying the format.
  #
 +# Define TEST_GIT_INDEX_VERSION to 2, 3 or 4 to run the test suite
 +# with a different indexfile format version.  If it isn't set the index
 +# file format used is index-v[23].
++#
+ # Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
+ # return NULL when it receives a bogus time_t.
  
  GIT-VERSION-FILE: FORCE
        @$(SHELL_PATH) ./GIT-VERSION-GEN

diff --cc config.mak.uname
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc t/t4212-log-corrupt.sh
Simple merge