From: Junio C Hamano Date: Wed, 6 Jul 2016 20:38:15 +0000 (-0700) Subject: Merge branch 'jk/tzoffset-fix' X-Git-Tag: v2.10.0-rc0~150 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6a729f344da03d9da07848ab33d98643976ed22;p=thirdparty%2Fgit.git Merge branch 'jk/tzoffset-fix' The internal code used to show local timezone offset is not prepared to handle timestamps beyond year 2100, and gave a bogus offset value to the caller. Use a more benign looking +0000 instead and let "git log" going in such a case, instead of aborting. * jk/tzoffset-fix: local_tzoffset: detect errors from tm_to_time_t t0006: test various date formats t0006: rename test-date's "show" to "relative" --- f6a729f344da03d9da07848ab33d98643976ed22