From: Junio C Hamano Date: Mon, 1 May 2006 08:55:02 +0000 (-0700) Subject: Merge branch 'jc/fmt-patch' into next X-Git-Tag: v1.4.1-rc1~157 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9318ec234b75eed6dce10e328c93705fec89b31d?hp=-c Merge branch 'jc/fmt-patch' into next * jc/fmt-patch: Use RFC2822 dates from "git fmt-patch". --- 9318ec234b75eed6dce10e328c93705fec89b31d diff --combined cache.h index b3e8de4270,f6c5909598..a0cf8ca193 --- a/cache.h +++ b/cache.h @@@ -114,7 -114,6 +114,7 @@@ static inline unsigned int create_ce_mo extern struct cache_entry **active_cache; extern unsigned int active_nr, active_alloc, active_cache_changed; +extern struct cache_tree *active_cache_tree; #define GIT_DIR_ENVIRONMENT "GIT_DIR" #define DEFAULT_GIT_DIR_ENVIRONMENT ".git" @@@ -135,8 -134,6 +135,8 @@@ extern const char *setup_git_directory_ extern const char *setup_git_directory(void); extern const char *prefix_path(const char *prefix, int len, const char *path); extern const char *prefix_filename(const char *prefix, int len, const char *path); +extern void verify_filename(const char *prefix, const char *name); +extern void verify_non_filename(const char *prefix, const char *name); #define alloc_nr(x) (((x)+16)*3/2) @@@ -252,6 -249,7 +252,7 @@@ extern void *read_object_with_reference unsigned char *sha1_ret); const char *show_date(unsigned long time, int timezone); + const char *show_rfc2822_date(unsigned long time, int timezone); int parse_date(const char *date, char *buf, int bufsize); void datestamp(char *buf, int bufsize); unsigned long approxidate(const char *);