aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-27 14:57:37 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-27 14:57:37 -0800
commit103209c6782586d92b04ee1fc71c0fd6f6385f5f (patch)
tree6add5ef9c0464315cbfceb3e11beaf95caf731e3 /cache.h
parent68186857a9bb0a71e9456155623e02d398a5b817 (diff)
parent6c647af3060b8dd20da0e0b21dcd0eb95ec70841 (diff)
downloadgit-103209c6782586d92b04ee1fc71c0fd6f6385f5f.tar.gz
git-103209c6782586d92b04ee1fc71c0fd6f6385f5f.tar.xz
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
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index b3370eb41..d478eff1f 100644
--- a/cache.h
+++ b/cache.h
@@ -762,7 +762,8 @@ const char *show_date_relative(unsigned long time, int tz,
size_t timebuf_size);
int parse_date(const char *date, char *buf, int bufsize);
void datestamp(char *buf, int bufsize);
-unsigned long approxidate(const char *);
+#define approxidate(s) approxidate_careful((s), NULL)
+unsigned long approxidate_careful(const char *, int *);
unsigned long approxidate_relative(const char *date, const struct timeval *now);
enum date_mode parse_date_format(const char *format);