From: Junio C Hamano <junkio@cox.net>
Date: Tue, 23 May 2006 21:53:17 +0000 (-0700)
Subject: Merge branch 'be/tag' into next
X-Git-Tag: v1.4.1-rc1~68
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae51cb04bc29109ae1c1dcfa10d6cef311d48a3c?hp=-c

Merge branch 'be/tag' into next

* be/tag:
add more informative error messages to git-mktag
remove the artificial restriction tagsize < 8kb
---

ae51cb04bc29109ae1c1dcfa10d6cef311d48a3c
diff --combined cache.h
index 31755c85a0,b19d84470b..f11d5e7dcf
--- 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"
@@@ -143,7 -142,6 +143,7 @@@ extern void verify_non_filename(const c
  /* Initialize and use the cache information */
  extern int read_cache(void);
  extern int write_cache(int newfd, struct cache_entry **cache, int entries);
 +extern int verify_path(const char *path);
  extern int cache_name_pos(const char *name, int namelen);
  #define ADD_CACHE_OK_TO_ADD 1		/* Ok to add */
  #define ADD_CACHE_OK_TO_REPLACE 2	/* Ok to replace file/directory */
@@@ -156,6 -154,7 +156,7 @@@ extern int ce_match_stat(struct cache_e
  extern int ce_modified(struct cache_entry *ce, struct stat *st, int);
  extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
  extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type);
+ extern int read_pipe(int fd, char** return_buf, unsigned long* return_size);
  extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
  extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
  extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
@@@ -259,7 -258,6 +260,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 *);