Merge branch 'fc/makefile'

diff --git a/cache.h b/cache.h
index 9670d99f2bdef5d1570ae6b808b40c66e873e656..df532f8e4a597a0c9c4d3cbb4980f5d62a106334 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -910,6 +910,7 @@ void show_date_relative(unsigned long time, int tz, const struct timeval *now,
                        struct strbuf *timebuf);
 int parse_date(const char *date, char *buf, int bufsize);
 int parse_date_basic(const char *date, unsigned long *timestamp, int *offset);
+int parse_expiry_date(const char *date, unsigned long *timestamp);
 void datestamp(char *buf, int bufsize);
 #define approxidate(s) approxidate_careful((s), NULL)
 unsigned long approxidate_careful(const char *, int *);