summaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-04-01 07:43:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-01 21:40:05 (GMT)
commitf80d1f95f0adf9909f42eb9e74546963daa4b0c1 (patch)
tree075c755aec4819bc9a36adeb4174c229beaa7eb7 /git-merge-one-file.sh
parent6654754779d2a90af91a9c6b93d7e4e7ee16cfab (diff)
downloadgit-f80d1f95f0adf9909f42eb9e74546963daa4b0c1.zip
git-f80d1f95f0adf9909f42eb9e74546963daa4b0c1.tar.gz
git-f80d1f95f0adf9909f42eb9e74546963daa4b0c1.tar.bz2
t4212: loosen far-in-future test for AIX
One of the tests in t4212 checks our behavior when we feed gmtime a date so far in the future that it gives up and returns NULL. Some implementations, like AIX, may actually just provide us a bogus result instead. It's not worth it for us to come up with heuristics that guess whether the return value is sensible or not. On good platforms where gmtime reports the problem to us with NULL, we will print the epoch value. On bad platforms, we will print garbage. But our test should be written for the lowest common denominator so that it passes everywhere. Reported-by: Charles Bailey <cbailey32@bloomberg.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions