From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Apr 2014 18:59:05 +0000 (-0700)
Subject: Merge branch 'jk/commit-dates-parsing-fix'
X-Git-Tag: v2.0.0-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bdb830c44567ebbdec497e6af21b87d4e43539cc

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
---

bdb830c44567ebbdec497e6af21b87d4e43539cc
diff --cc Makefile
index c5316a34ac,da7013b1bc..f49f187516
--- a/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