From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 13 Aug 2010 01:31:03 +0000 (-0700)
Subject: Merge branch 'jn/parse-date-basic'
X-Git-Tag: v1.7.3-rc0~88
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa8b8f40df07972fad357420415ff9bbdf22dd9e?ds=inline;hp=-c

Merge branch 'jn/parse-date-basic'

* jn/parse-date-basic:
Export parse_date_basic() to convert a date string to timestamp
---

aa8b8f40df07972fad357420415ff9bbdf22dd9e
diff --combined cache.h
index 1e690d1240,68258be97d..37ef9d8a00
--- a/cache.h
+++ b/cache.h
@@@ -449,7 -449,7 +449,7 @@@ extern int init_db(const char *template
  				alloc = alloc_nr(alloc); \
  			x = xrealloc((x), alloc * sizeof(*(x))); \
  		} \
 -	} while(0)
 +	} while (0)
  
  /* Initialize and use the cache information */
  extern int read_index(struct index_state *);
@@@ -811,6 -811,7 +811,7 @@@ const char *show_date_relative(unsigne
  			       char *timebuf,
  			       size_t timebuf_size);
  int parse_date(const char *date, char *buf, int bufsize);
+ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset);
  void datestamp(char *buf, int bufsize);
  #define approxidate(s) approxidate_careful((s), NULL)
  unsigned long approxidate_careful(const char *, int *);