Merge branch 'jc/maint-reflog-bad-timestamp'

* jc/maint-reflog-bad-timestamp:
t0101: use a fixed timestamp when searching in the reflog
Update @{bogus.timestamp} fix not to die()
approxidate_careful() reports errorneous date string

diff --cc cache.h
Simple merge

diff --cc date.c
Simple merge

diff --cc sha1_name.c
Simple merge