Allow git-diff exit with codes similar to diff(1)

diff --git a/cache.h b/cache.h
index ae25759c433a29caeb8662ef3ccfe4c0f3422bd5..a4762eda5c3dbf34fb1742b1c645395f092d8d6b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -281,7 +281,6 @@ char *enter_repo(char *path, int strict);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);
-extern void * unpack_sha1_file(void *map, unsigned long mapsize, enum object_type *type, unsigned long *size);
 extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size);
 extern int hash_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *sha1);
 extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
@@ -373,6 +372,7 @@ extern struct packed_git {
        struct packed_git *next;
        struct pack_window *windows;
        uint32_t *index_base;
+       time_t mtime;
        off_t index_size;
        off_t pack_size;
        int pack_fd;
@@ -481,6 +481,7 @@ extern struct tag *alloc_tag_node(void);
 extern void alloc_report(void);
 
 /* trace.c */
+extern int nfasprintf(char **str, const char *fmt, ...);
 extern int nfvasprintf(char **str, const char *fmt, va_list va);
 extern void trace_printf(const char *format, ...);
 extern void trace_argv_printf(const char **argv, int count, const char *format, ...);